FlexRay node and buffer configuration improved

Channel is now selected by string A, B or AB instead of 0, 1, 2 and
reconfiguration rules are now selected by strings mnemonics too.

diff --git a/rpp/blocks/rpp_fr_lib.slx b/rpp/blocks/rpp_fr_lib.slx
index 5cd2d9861b78ad5a54478b9d5ac4a22b56f5c08b..82c8a4867c0de8e66e3f3c47ce560e76119e7ee9 100644 (file)
Binary files a/rpp/blocks/rpp_fr_lib.slx and b/rpp/blocks/rpp_fr_lib.slx differ

diff --git a/rpp/blocks/tlc_c/sfunction_frayreceive.tlc b/rpp/blocks/tlc_c/sfunction_frayreceive.tlc
index 271c5fd0dc5e40af7e487514cd6b72744767ac6a..6d59885f4c2688612eed2526de174f5a99bd204a 100644 (file)
--- a/rpp/blocks/tlc_c/sfunction_frayreceive.tlc
+++ b/rpp/blocks/tlc_c/sfunction_frayreceive.tlc
@@ -56,10 +56,13 @@
          .channel = FR_CHANNEL_AB,
        %endif
        .cycleCounterFiltering = %<cycleCounterFiltering_val>,
+       .fidMask = 0,
        .isTx = FALSE,
        .maxPayload = %<maxPayload_val>,
        .msgBufferInterrupt = %<msgBufferInterrupt_val>,
        .payloadPreambleIndicatorTr = %<payloadPreambleIndicatorTr_val>,
+       .rejectNullFrames = FALSE,
+       .rejectStaticSegment = FALSE,
        .singleTransmit = %<singleTransmit_val>,
        .slotId = %<slotId_val>
   },

diff --git a/rpp/blocks/tlc_c/sfunction_fraytransmit.tlc b/rpp/blocks/tlc_c/sfunction_fraytransmit.tlc
index 547e3261fc69a463c64bc63e74c8069fe17e6abd..f1bd37cacbe9cd423039eedd30872eaef78b5945 100644 (file)
--- a/rpp/blocks/tlc_c/sfunction_fraytransmit.tlc
+++ b/rpp/blocks/tlc_c/sfunction_fraytransmit.tlc
@@ -48,18 +48,21 @@
 
   %openfile buffer
   {
-       %if %<channel_val>==1
+       %if channel_val == 1U
          .channel = FR_CHANNEL_A,
-       %elseif %<channel_val>==2
+       %elseif channel_val == 2U
          .channel = FR_CHANNEL_B,
        %else
-         .channel = FR_CHANNEL_AB,
+         .channel = FR_CHANNEL_AB,       
        %endif
        .cycleCounterFiltering = %<cycleCounterFiltering_val>,
+       .fidMask = 0,
        .isTx = TRUE,
        .maxPayload = %<maxPayload_val>,
        .msgBufferInterrupt = %<msgBufferInterrupt_val>,
        .payloadPreambleIndicatorTr = %<payloadPreambleIndicatorTr_val>,
+       .rejectNullFrames = FALSE,
+       .rejectStaticSegment = FALSE,
        .singleTransmit = %<singleTransmit_val>,
        .slotId = %<slotId_val>
   },

diff --git a/rpp/demos/fray_motor_demo.slx b/rpp/demos/fray_motor_demo.slx
index 8860d3454287f5a2ac9ad656d10caea55558b154..08c916f8e3cdf30ef074d9cb656d3e0e4b8d8519 100644 (file)
Binary files a/rpp/demos/fray_motor_demo.slx and b/rpp/demos/fray_motor_demo.slx differ