FlexRay configuration modified, new parameters added.

diff --git a/commands/cmd_fr_basic_test.c b/commands/cmd_fr_basic_test.c
index 97d69d183518ef84e1fb4559e81a3d7b1343fae4..b76346d62f480f0601657788b876f608651cb6fc 100644 (file)
--- a/commands/cmd_fr_basic_test.c
+++ b/commands/cmd_fr_basic_test.c
@@ -16,7 +16,7 @@
 #include "stdio.h"
 
 Fr_TMS570LS_ClusterConfigType Fr_cluster_config = {
-       .gColdStartAttempts = 4,
+       .gColdStartAttempts = 0x2,
        .gListenNoise = 0xF,
        .gMacroPerCycle = 0x15E0,       // (cycle period, 5.6us)
        .gMaxWithoutClockCorrectionFatal = 0xF,
@@ -28,12 +28,12 @@ Fr_TMS570LS_ClusterConfigType Fr_cluster_config = {
        .gPayloadLengthStatic = 0x9,
        .gSyncNodeMax = 0xF,
        .gdActionPointOffset = 0x4,
-       .gdCASRxLowMax = 80,
+       .gdCASRxLowMax = 0x43,
        .gdDynamicSlotIdlePhase = 0x1,
        .gdMinislot = 0x4,
        .gdMinislotActionPointOffset = 0x2,
        .gdNIT = 0xAE3,
-       .gdSampleClockPeriod = 0,
+       .gdSampleClockPeriod = 0,               // 10mbit/sec
        .gdStaticSlot = 0x56,
        .gdTSSTransmitter = 0xA,
        .gdWakeupSymbolRxIdle = 18,
@@ -45,7 +45,7 @@ Fr_TMS570LS_ClusterConfigType Fr_cluster_config = {
 
 Fr_TMS570LS_NodeConfigType Fr_node_A_config = {
        .pAllowHaltDueToClock = 0,
-       .pAllowPassiveToActive = TRUE,
+       .pAllowPassiveToActive = FALSE,
        .pChannels = FR_CHANNEL_AB,
        .pClusterDriftDamping = 0x1,
        .pDelayCompensationA = 0x3,
@@ -60,41 +60,45 @@ Fr_TMS570LS_NodeConfigType Fr_node_A_config = {
        .pMicroInitialOffsetA = 0x18,
        .pMicroInitialOffsetB = 0x18,
        .pMicroPerCycle = 0x36B00,
-       .pRateCorrectionOut = 0x151,
-       .pSamplesPerMicrotick = 2,
-       .pSingleSlotEnabled = FALSE,
+       .pRateCorrectionOut = 0xCD,
+       .pOffsetCorrectionOut = 0x151,
+       .pSamplesPerMicrotick = 0,              // 10 mbit/sec
+       .pSingleSlotEnabled = TRUE,
        .pWakeupChannel = FR_CHANNEL_A,
        .pWakeupPattern = 2,
        .pdAcceptedStartupRange = 0x81,
        .pdListenTimeout = 0x36DA2,
-       .pdMaxDrift = 0x151
+       .pdMaxDrift = 0x151,
+       .pDecodingCorrection = 0x33
 };
 
 Fr_TMS570LS_NodeConfigType Fr_node_B_config = {
-       .pAllowHaltDueToClock = 0,
-       .pAllowPassiveToActive = TRUE,
-       .pChannels = FR_CHANNEL_AB,
-       .pClusterDriftDamping = 0x1,
-       .pDelayCompensationA = 0x3,
-       .pDelayCompensationB = 0x3,
-       .pExternOffsetCorrection = 0,
-       .pExternRateCorrection = 0,
-       .pKeySlotUsedForStartup = TRUE,
-       .pKeySlotUsedForSync = TRUE,
-       .pLatestTx = 0x10D,
-       .pMacroInitialOffsetA = 0x6,
-       .pMacroInitialOffsetB = 0x6,
-       .pMicroInitialOffsetA = 0x18,
-       .pMicroInitialOffsetB = 0x18,
-       .pMicroPerCycle = 0x36B00,
-       .pRateCorrectionOut = 0x151,
-       .pSamplesPerMicrotick = 2,
-       .pSingleSlotEnabled = FALSE,
-       .pWakeupChannel = FR_CHANNEL_A,
-       .pWakeupPattern = 2,
-       .pdAcceptedStartupRange = 0x81,
-       .pdListenTimeout = 0x36DA2,
-       .pdMaxDrift = 0x151
+               .pAllowHaltDueToClock = 0,
+               .pAllowPassiveToActive = FALSE,
+               .pChannels = FR_CHANNEL_AB,
+               .pClusterDriftDamping = 0x1,
+               .pDelayCompensationA = 0x3,
+               .pDelayCompensationB = 0x3,
+               .pExternOffsetCorrection = 0,
+               .pExternRateCorrection = 0,
+               .pKeySlotUsedForStartup = TRUE,
+               .pKeySlotUsedForSync = TRUE,
+               .pLatestTx = 0x10D,
+               .pMacroInitialOffsetA = 0x6,
+               .pMacroInitialOffsetB = 0x6,
+               .pMicroInitialOffsetA = 0x18,
+               .pMicroInitialOffsetB = 0x18,
+               .pMicroPerCycle = 0x36B00,
+               .pRateCorrectionOut = 0xCD,
+               .pOffsetCorrectionOut = 0x151,
+               .pSamplesPerMicrotick = 0,              // 10 mbit/sec
+               .pSingleSlotEnabled = TRUE,
+               .pWakeupChannel = FR_CHANNEL_A,
+               .pWakeupPattern = 2,
+               .pdAcceptedStartupRange = 0x81,
+               .pdListenTimeout = 0x36DA2,
+               .pdMaxDrift = 0x151,
+               .pDecodingCorrection = 0x33
 };
 
 Fr_TMS570LS_MsgRAMConfig Fr_node_A_msgRAM_config = {
@@ -142,7 +146,7 @@ Fr_TMS570LS_BufferConfigType Fr_node_A_static_buffers_config[] = {
                .channel = FR_CHANNEL_AB,
                .cycleCounterFiltering = 0,
                .isTx = TRUE,
-               .maxPayload = 127,
+               .maxPayload = 9,
                .msgBufferInterrupt = TRUE,
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,
@@ -154,7 +158,7 @@ Fr_TMS570LS_BufferConfigType Fr_node_A_static_buffers_config[] = {
                .channel = FR_CHANNEL_AB,
                .cycleCounterFiltering = 0,
                .isTx = FALSE,
-               .maxPayload = 127,
+               .maxPayload = 9,
                .msgBufferInterrupt = TRUE,
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,
@@ -193,7 +197,7 @@ Fr_TMS570LS_BufferConfigType Fr_node_B_static_buffers_config[] = {
                .channel = FR_CHANNEL_AB,
                .cycleCounterFiltering = 0,
                .isTx = TRUE,
-               .maxPayload = 127,
+               .maxPayload = 9,
                .msgBufferInterrupt = TRUE,
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,
@@ -205,7 +209,7 @@ Fr_TMS570LS_BufferConfigType Fr_node_B_static_buffers_config[] = {
                .channel = FR_CHANNEL_AB,
                .cycleCounterFiltering = 0,
                .isTx = FALSE,
-               .maxPayload = 127,
+               .maxPayload = 9,
                .msgBufferInterrupt = TRUE,
                .payloadPreambleIndicatorTr = FALSE,
                .rejectNullFrames = FALSE,

diff --git a/rpp-lib b/rpp-lib
index 5e8aff91b83bfdabd975b32e5bddb33e268bf88f..af0656b97be98ba6d052b1038cfc7b9526a27b5a 160000 (submodule)
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit 5e8aff91b83bfdabd975b32e5bddb33e268bf88f
+Subproject commit af0656b97be98ba6d052b1038cfc7b9526a27b5a