Merge branch 'master' into release

svankappel · Jun 4, 2024 · e769a07 · e769a07
2 parents bf52134 + da3736d
commit e769a07
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Software/telemetry_system/src/task/can_controller.c b/Software/telemetry_system/src/task/can_controller.c
@@ -141,17 +141,18 @@ void CAN_Controller(void)
 
 		if((frame.id==canButtonId_start) && (frame.dlc == canButtonDlc_start))	//if we receive a message from can button canid
 		{
-			if(frame.data[canButtonIndex_start]==(canButtonMask_start & canButtonMatch_start))	//if can message at index
+			if((frame.data[canButtonIndex_start] & canButtonMask_start)==canButtonMatch_start)	//if can message at index
 			{
 				data_Logger_button_handler_start();		//call Data Logger button handler
+				continue;
 			}
 		}
-
 		if((frame.id==canButtonId_stop) && (frame.dlc == canButtonDlc_stop))	//if we receive a message from can button canid
 		{
-			if(frame.data[canButtonIndex_stop]==(canButtonMask_stop & canButtonMatch_stop))	//if can message at index
+			if((frame.data[canButtonIndex_stop] & canButtonMask_stop)==canButtonMatch_stop)	//if can message at index
 			{
 				data_Logger_button_handler_stop();		//call Data Logger button handler
+				continue;
 			}
 		}
 

diff --git a/Software/telemetry_system_recorder/src/task/can_controller.c b/Software/telemetry_system_recorder/src/task/can_controller.c
@@ -161,15 +161,15 @@ void CAN_Controller(void)
 
 		if((frame.id==canButtonId_start) && (frame.dlc == canButtonDlc_start))	//if we receive a message from can button canid
 		{
-			if(frame.data[canButtonIndex_start]==(canButtonMask_start & canButtonMatch_start))	//if can message at index
+			if((frame.data[canButtonIndex_start] & canButtonMask_start)==canButtonMatch_start)	//if can message at index
 			{
 				data_Logger_button_handler_start();		//call Data Logger button handler
 				continue;
 			}
 		}
 		if((frame.id==canButtonId_stop) && (frame.dlc == canButtonDlc_stop))	//if we receive a message from can button canid
 		{
-			if(frame.data[canButtonIndex_stop]==(canButtonMask_stop & canButtonMatch_stop))	//if can message at index
+			if((frame.data[canButtonIndex_stop] & canButtonMask_stop)==canButtonMatch_stop)	//if can message at index
 			{
 				data_Logger_button_handler_stop();		//call Data Logger button handler
 				continue;