From 0af049fc9f37aef1c4f1ef605edf4b3c36db2e03 Mon Sep 17 00:00:00 2001
From: Michal Horn <hornmich@fel.cvut.cz>
Date: Mon, 30 Sep 2013 17:51:10 +0200
Subject: [PATCH] Configuration parameters for FlexRay examples extended and
 corrected to reflect final changes in the driver

---
 rpp-lib                                  |  2 +-
 rpp-test-sw/commands/cmd_fray.c          |  9 +++++++--
 rpp-test-sw/commands/cmd_motor_example.c | 14 +++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/rpp-lib b/rpp-lib
index 9fe20a4..7511be1 160000
--- a/rpp-lib
+++ b/rpp-lib
@@ -1 +1 @@
-Subproject commit 9fe20a4cee2fa801b5c6e2af5a231cecba93fc82
+Subproject commit 7511be1eabbd2b92768874dc7de7623957ee5980
diff --git a/rpp-test-sw/commands/cmd_fray.c b/rpp-test-sw/commands/cmd_fray.c
index 68cb52b..58f2381 100644
--- a/rpp-test-sw/commands/cmd_fray.c
+++ b/rpp-test-sw/commands/cmd_fray.c
@@ -79,13 +79,14 @@ static Fr_TMS570LS_ClusterConfigType Fr_cluster_config = {
 	.gdWakeupSymbolTxLow = 60
 };
 
+
 /**
  * This structure contains local configuration of the FlexRay node A.
  * That is the node that transmits messages to the node B.
  */
 static Fr_TMS570LS_NodeConfigType Fr_node_A_config = {
 	.pAllowHaltDueToClock = 0,
-	.pAllowPassiveToActive = FALSE,
+	.pAllowPassiveToActive = 0xF,
 	.pChannels = FR_CHANNEL_AB,
 	.pClusterDriftDamping = 0x1,
 	.pDelayCompensationA = 0x3,
@@ -118,7 +119,7 @@ static Fr_TMS570LS_NodeConfigType Fr_node_A_config = {
  */
 static Fr_TMS570LS_NodeConfigType Fr_node_B_config = {
 		.pAllowHaltDueToClock = 0,
-		.pAllowPassiveToActive = FALSE,
+		.pAllowPassiveToActive = 0xF,
 		.pChannels = FR_CHANNEL_AB,
 		.pClusterDriftDamping = 0x1,
 		.pDelayCompensationA = 0x3,
@@ -182,6 +183,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_A_static_buffers_config[] = {
 			.channel = FR_CHANNEL_AB,
 			.cycleCounterFiltering = 0,
 			.isTx = TRUE,
+			.fidMask = 0,
 			.maxPayload = 9,
 			.msgBufferInterrupt = TRUE,
 			.payloadPreambleIndicatorTr = FALSE,
@@ -194,6 +196,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_A_static_buffers_config[] = {
 			.channel = FR_CHANNEL_AB,
 			.cycleCounterFiltering = 0,
 			.isTx = TRUE,
+			.fidMask = 0,
 			.maxPayload = 9,
 			.msgBufferInterrupt = TRUE,
 			.payloadPreambleIndicatorTr = FALSE,
@@ -216,6 +219,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_B_static_buffers_config[] = {
 		.channel = FR_CHANNEL_AB,
 		.cycleCounterFiltering = 0,
 		.isTx = TRUE,
+		.fidMask = 0,
 		.maxPayload = 9,
 		.msgBufferInterrupt = TRUE,
 		.payloadPreambleIndicatorTr = FALSE,
@@ -228,6 +232,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_B_static_buffers_config[] = {
 		.channel = FR_CHANNEL_AB,
 		.cycleCounterFiltering = 0,
 		.isTx = FALSE,
+		.fidMask = 0,
 		.maxPayload = 9,
 		.msgBufferInterrupt = TRUE,
 		.payloadPreambleIndicatorTr = FALSE,
diff --git a/rpp-test-sw/commands/cmd_motor_example.c b/rpp-test-sw/commands/cmd_motor_example.c
index d6b470d..b7d8c86 100644
--- a/rpp-test-sw/commands/cmd_motor_example.c
+++ b/rpp-test-sw/commands/cmd_motor_example.c
@@ -57,7 +57,7 @@ static Fr_TMS570LS_ClusterConfigType Fr_cluster_config = {
 	.gNumberOfMinislots = 0x15A,
 	.gNumberOfStaticSlots = 0x8,
 	.gOffsetCorrectionStart = 0xAE4,
-	.gPayloadLengthStatic = 0x6,
+	.gPayloadLengthStatic = 0x2,
 	.gSyncNodeMax = 0xF,
 	.gdActionPointOffset = 0x4,
 	.gdCASRxLowMax = 0x43,
@@ -81,7 +81,7 @@ static Fr_TMS570LS_ClusterConfigType Fr_cluster_config = {
  */
 static Fr_TMS570LS_NodeConfigType Fr_node_control_config = {
 	.pAllowHaltDueToClock = 0,
-	.pAllowPassiveToActive = FALSE,
+	.pAllowPassiveToActive = 0xF,
 	.pChannels = FR_CHANNEL_AB,
 	.pClusterDriftDamping = 0x1,
 	.pDelayCompensationA = 0x3,
@@ -115,7 +115,7 @@ static Fr_TMS570LS_NodeConfigType Fr_node_control_config = {
  */
 static Fr_TMS570LS_NodeConfigType Fr_node_motor_config = {
 		.pAllowHaltDueToClock = 0,
-		.pAllowPassiveToActive = FALSE,
+		.pAllowPassiveToActive = 0xF,
 		.pChannels = FR_CHANNEL_AB,
 		.pClusterDriftDamping = 0x1,
 		.pDelayCompensationA = 0x3,
@@ -176,7 +176,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_control_static_buffers_config[] = {
 			.channel = FR_CHANNEL_AB,
 			.cycleCounterFiltering = 0,
 			.isTx = TRUE,
-			.maxPayload = 6,
+			.maxPayload = 2,
 			.msgBufferInterrupt = TRUE,
 			.payloadPreambleIndicatorTr = FALSE,
 			.rejectNullFrames = FALSE,
@@ -188,7 +188,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_control_static_buffers_config[] = {
 			.channel = FR_CHANNEL_AB,
 			.cycleCounterFiltering = 0,
 			.isTx = TRUE,
-			.maxPayload = 6,
+			.maxPayload = 2,
 			.msgBufferInterrupt = TRUE,
 			.payloadPreambleIndicatorTr = FALSE,
 			.rejectNullFrames = FALSE,
@@ -209,7 +209,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_motor_static_buffers_config[] = {
 		.channel = FR_CHANNEL_AB,
 		.cycleCounterFiltering = 0,
 		.isTx = TRUE,
-		.maxPayload = 6,
+		.maxPayload = 2,
 		.msgBufferInterrupt = TRUE,
 		.payloadPreambleIndicatorTr = FALSE,
 		.rejectNullFrames = FALSE,
@@ -221,7 +221,7 @@ static Fr_TMS570LS_BufferConfigType Fr_node_motor_static_buffers_config[] = {
 		.channel = FR_CHANNEL_AB,
 		.cycleCounterFiltering = 0,
 		.isTx = FALSE,
-		.maxPayload = 6,
+		.maxPayload = 2,
 		.msgBufferInterrupt = TRUE,
 		.payloadPreambleIndicatorTr = FALSE,
 		.rejectNullFrames = FALSE,
-- 
2.39.2