Mercurial > public > ostc4

changeset 277:580822b5d3d1 IPC_Sync_Improvment_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rework SPI error handling. SPI_Start_single_TxRx_with_Master evaluated the incoming data for a condition to send device instead of life data. In case of invalid input data this may cause unintended transmission of device data => now lifedata is send if incoming data is expected to be invalid The SPI timeout monitoring was done at the beginning of the mode loop. A timeout may have been detected even if meanwhile valid data was received (this is evaluated at x20ms) => Moved the timeout monitoring after the handling of incoming data
author ideenmodellierer
date Sun, 28 Apr 2019 10:16:38 +0200
parents 8e9c502c0b06
children cc30d1aa03a7
files Small_CPU/Src/scheduler.c Small_CPU/Src/spi.c
diffstat 2 files changed, 21 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/Small_CPU/Src/scheduler.c	Sun Apr 28 10:06:27 2019 +0200
+++ b/Small_CPU/Src/scheduler.c	Sun Apr 28 10:16:38 2019 +0200
@@ -421,7 +421,7 @@
 		/* Try to start communication again. If exchange is stuck during execution for some reason the TX will be aborted by the
 		 * function error handler
 		 */
-		SPI_Start_single_TxRx_with_Master();
+		HAL_SPI_TransmitReceive_DMA(&hspi1,(uint8_t*) &(global.dataSendToMaster),(uint8_t*) &(global.dataSendToSlave), EXCHANGE_BUFFERSIZE);
 		Scheduler.communicationTimeout = SPI_COM_TIMEOUT_COMMON;	/* Reduce error detection time */
 		Scheduler_Request_sync_with_SPI(SPI_SYNC_METHOD_HARD);
 	}
@@ -459,21 +459,23 @@
 	Scheduler.tickstart = HAL_GetTick();
 	while(global.mode == MODE_DIVE)
 	{
-		schedule_check_resync();
 		lasttick = HAL_GetTick();
 		ticksdiff = time_elapsed_ms(Scheduler.tickstart,lasttick);
 
 		if(ticksdiff >= Scheduler.counterSPIdata100msec * 100 + 10)
 		{
-			SPI_Evaluate_RX_Data();
-			Scheduler.counterSPIdata100msec++;
+			if(SPI_Evaluate_RX_Data()!=0) /* did we receive something ? */
+			{
+				Scheduler.counterSPIdata100msec++;
+			}
+			schedule_check_resync();
 		}
 
 		//Evaluate pressure at 20 ms, 120 ms, 220 ms,....
 		if(ticksdiff >= Scheduler.counterPressure100msec * 100 + 20)
 		{
 				global.check_sync_not_running++;
-				pressure_update();
+				pressure_update_alternating();
 				scheduleUpdateDeviceData();
 #ifdef DEMOMODE
 				if(global.demo_mode)
@@ -663,15 +665,17 @@
 	
 	while(global.mode == MODE_TEST)
 	{
-		schedule_check_resync();
 		lasttick = HAL_GetTick();
 		ticksdiff = time_elapsed_ms(Scheduler.tickstart,lasttick);
 
 		//Evaluate received data at 10 ms, 110 ms, 210 ms,...
 		if(ticksdiff >= Scheduler.counterSPIdata100msec * 100 + 10)
 		{
-			SPI_Evaluate_RX_Data();
-			Scheduler.counterSPIdata100msec++;
+			if(SPI_Evaluate_RX_Data()!=0) /* did we receive something ? */
+			{
+				Scheduler.counterSPIdata100msec++;
+			}
+			schedule_check_resync();
 		}
 		
 		//Evaluate pressure at 20 ms, 120 ms, 220 ms,...
@@ -679,7 +683,7 @@
 		{
 				global.check_sync_not_running++;
 
-				pressure_update();
+				pressure_update_alternating();
 				scheduleUpdateDeviceData();
 				global.lifeData.ascent_rate_meter_per_min = 0;
 				copyPressureData();
@@ -737,7 +741,7 @@
 
 	while(global.mode == MODE_SURFACE)
 	{
-		schedule_check_resync();
+
 		lasttick = HAL_GetTick();
 		ticksdiff = time_elapsed_ms(Scheduler.tickstart,lasttick);
 
@@ -754,13 +758,14 @@
 			{			
 				Scheduler.counterSPIdata100msec++;
 			}
+			schedule_check_resync();
 		}
 
 		/* Evaluate pressure at 20 ms, 120 ms, 220 ms,... duration ~22ms] */
 		if(ticksdiff >= Scheduler.counterPressure100msec * 100 + 20)
 		{
 				global.check_sync_not_running++;
-				pressure_update();
+				pressure_update_alternating();
 				scheduleUpdateDeviceData();
 				global.lifeData.ascent_rate_meter_per_min = 0;
 				copyPressureData();
--- a/Small_CPU/Src/spi.c	Sun Apr 28 10:06:27 2019 +0200
+++ b/Small_CPU/Src/spi.c	Sun Apr 28 10:16:38 2019 +0200
@@ -358,9 +358,10 @@
 				HAL_SPI_Abort_IT(&hspi1);
 				Scheduler_Request_sync_with_SPI(SPI_SYNC_METHOD_HARD);
 			}
-			 else
-			 {
-			 }
+			else
+			{
+			}
+			SPI_Start_single_TxRx_with_Master();
 		}
 		else
 		{
@@ -386,6 +387,7 @@
 					global.dataSendToMaster.header.checkCode[SPI_HEADER_INDEX_RX_STATE] = SPI_RX_STATE_OFFLINE;
 					resettimeout = 0;
 				}
+				HAL_SPI_TransmitReceive_DMA(&hspi1,(uint8_t*) &(global.dataSendToMaster),(uint8_t*) &(global.dataSendToSlave), EXCHANGE_BUFFERSIZE);
 		}
 
 		global.dataSendToMaster.power_on_reset = 0;
@@ -393,8 +395,6 @@
 
 		scheduleSpecial_Evaluate_DataSendToSlave();
 
-		SPI_Start_single_TxRx_with_Master();
-
 		if(resettimeout)
 		{
 				global.check_sync_not_running = 0;