Mercurial > public > ostc4

diff Small_CPU/Src/i2c.c @ 88:3db7389d49cc kittz

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert
author Dmitry Romanov <kitt@bk.ru>
date Thu, 22 Nov 2018 12:02:55 +0300
parents e6abbef57475
children c6d284ea265b
line wrap: on
line diff
--- a/Small_CPU/Src/i2c.c	Wed Nov 21 13:57:58 2018 +0300
+++ b/Small_CPU/Src/i2c.c	Thu Nov 22 12:02:55 2018 +0300
@@ -76,16 +76,17 @@
   I2cHandle.Init.NoStretchMode   = I2C_NOSTRETCH_DISABLED;
   I2cHandle.Init.OwnAddress1     = 0x01;
   
+	global.dataSendToSlaveStopEval = 1;
 
 	global.I2C_SystemStatus = HAL_I2C_Init(&I2cHandle);
 	HAL_I2CEx_AnalogFilter_Config(&I2cHandle, I2C_ANALOGFILTER_ENABLED);
 
 
-//	if(global.dataSendToSlavePending)
-//	{
-//		scheduleSpecial_Evaluate_DataSendToSlave();
-//	}
-	global.dataUpdateIsNeeded = 1;
+	global.dataSendToSlaveStopEval = 0;
+	if(global.dataSendToSlavePending)
+	{
+		scheduleSpecial_Evaluate_DataSendToSlave();
+	}
 	return (HAL_StatusTypeDef)global.I2C_SystemStatus;
 }
 
@@ -109,19 +110,18 @@
 	if(global.I2C_SystemStatus != HAL_OK)
 		return (HAL_StatusTypeDef)global.I2C_SystemStatus;
 	
+	global.dataSendToSlaveStopEval = 1;
 	
-
   global.I2C_SystemStatus = HAL_I2C_Master_Transmit(&I2cHandle, DevAddress,  pData, Size, 100 /*FIXME , 0*/);
 	if(global.I2C_SystemStatus != HAL_OK)
 	{
 		I2C_Error_count();
 	}
-
-//	if(global.dataSendToSlavePending)
-//	{
-//		scheduleSpecial_Evaluate_DataSendToSlave();
-//	}
-	global.dataUpdateIsNeeded = 1;
+	global.dataSendToSlaveStopEval = 0;
+	if(global.dataSendToSlavePending)
+	{
+		scheduleSpecial_Evaluate_DataSendToSlave();
+	}
 	return (HAL_StatusTypeDef)global.I2C_SystemStatus;
 }
 
@@ -132,7 +132,7 @@
 		return (HAL_StatusTypeDef)(global.I2C_SystemStatus & 0x03);
 
 	
-
+	global.dataSendToSlaveStopEval = 1;
 
 	global.I2C_SystemStatus = HAL_I2C_Master_Transmit(&I2cHandle, DevAddress,  pData, Size, 100 /*FIXME , 1*/);
 	if(global.I2C_SystemStatus != HAL_OK)
@@ -140,12 +140,12 @@
 		I2C_Error_count();
 	}
 
-//	if(global.dataSendToSlavePending)
-//	{
-//		scheduleSpecial_Evaluate_DataSendToSlave();
-//	}
-//
-	global.dataUpdateIsNeeded = 1;
+	global.dataSendToSlaveStopEval = 0;
+	if(global.dataSendToSlavePending)
+	{
+		scheduleSpecial_Evaluate_DataSendToSlave();
+	}
+	
 	return (HAL_StatusTypeDef)global.I2C_SystemStatus;
 }
 
@@ -157,6 +157,7 @@
 
 	uint8_t localHALstatusReturn = 0xFF;
 
+	global.dataSendToSlaveStopEval = 1;
 
   localHALstatusReturn = HAL_I2C_Master_Receive(&I2cHandle, DevAddress,  pData, Size, 100);
 	if(localHALstatusReturn != HAL_OK)
@@ -164,11 +165,11 @@
 		I2C_Error_count();
 	}
 
-	global.dataUpdateIsNeeded = 1;
-//	if(global.dataSendToSlavePending)
-//	{
-//		scheduleSpecial_Evaluate_DataSendToSlave();
-//	}
+	global.dataSendToSlaveStopEval = 0;
+	if(global.dataSendToSlavePending)
+	{
+		scheduleSpecial_Evaluate_DataSendToSlave();
+	}
 	return (HAL_StatusTypeDef)localHALstatusReturn;
 }