updated callbacks

Author: alejoseb

MODBUS-LIB/Inc/Modbus.h

@@ -195,8 +195,6 @@ uint16_t getTimeOut(); //!<get communication watch-dog timer value
 bool getTimeOutState(); //!<get communication watch-dog timer state
 void ModbusQuery(modbusHandler_t * modH, modbus_t telegram ); // put a query in the queue tail
 void ModbusQueryInject(modbusHandler_t * modH, modbus_t telegram); //put a query in the queue head
-//int8_t poll_master(); //!<cyclic poll for master
-//int8_t poll_slave( uint16_t *regs, uint8_t u8size ); //!<cyclic poll for slave
 uint16_t getInCnt(); //!<number of incoming messages
 uint16_t getOutCnt(); //!<number of outcoming messages
 uint16_t getErrCnt(); //!<error counter

MODBUS-LIB/Src/Modbus.c

@@ -27,32 +27,32 @@
 ///Queue Modbus RX
 //osMessageQueueId_t QueueModbusHandle;
 const osMessageQueueAttr_t QueueModbus_attributes = {
-       .name = "QueueModbus"
+       .name = "QueueModbusData"
 };
 
 ///Queue Modbus telegrams
 //osMessageQueueId_t QueueModbusHandle;
 const osMessageQueueAttr_t QueueTelegram_attributes = {
-       .name = "QueueTelegram"
+       .name = "QueueModbusTelegram"
 };
 
 //Task Modbus Slave
 //osThreadId_t myTaskModbusAHandle;
 const osThreadAttr_t myTaskModbusA_attributes = {
-    .name = "myTaskModbusA",
+    .name = "TaskModbusSlave",
     .priority = (osPriority_t) osPriorityNormal,
     .stack_size = 128 * 4
 };
 
-//Task Modbus Slave
+//Task Modbus Master
 //osThreadId_t myTaskModbusAHandle;
 const osThreadAttr_t myTaskModbusB_attributes = {
-    .name = "myTaskModbusB",
+    .name = "TaskModbusMaster",
     .priority = (osPriority_t) osPriorityNormal,
     .stack_size = 128 * 4
 };
 
-//Sempahore to access the Modbus Data
+//Semaphore to access the Modbus Data
 const osSemaphoreAttr_t ModBusSphr_attributes = {
     .name = "ModBusSphr"
 };
@@ -147,7 +147,6 @@ void ModbusInit(modbusHandler_t * modH)
 		  while(1); //Error Modbus type not supported choose a valid Type
 	  }
 	  //Create Semaphore DataRX
-	  //vSemaphoreCreateBinary(SemaphoreDataRX);
 	  //Create timer T35
 
 	  modH->xTimerT35 = xTimerCreate("TimerT35",         // Just a text name, not used by the kernel.
@@ -211,7 +210,7 @@ void ModbusStart(modbusHandler_t * modH)
 
 void vTimerCallbackT35(TimerHandle_t *pxTimer)
 {
-	//Notify that a steam has just arrived
+	//Notify that a stream has just arrived
 	int i;
 	//TimerHandle_t aux;
 	for(i = 0; i < numberHandlers; i++)
@@ -230,7 +229,7 @@ void vTimerCallbackT35(TimerHandle_t *pxTimer)
 
 void vTimerCallbackTimeout(TimerHandle_t *pxTimer)
 {
-	//Notify that a steam has just arrived
+	//Notify that a stream has just arrived
 	int i;
 	//TimerHandle_t aux;
 	for(i = 0; i < numberHandlers; i++)
@@ -426,12 +425,10 @@ int8_t SendQuery(modbusHandler_t *modH ,  modbus_t telegram )
 	    {
 	        if(i%2)
 	        {
-	            //modH->au8Buffer[ modH->u8BufferSize ] = lowByte( modH->au16regs[ i/2 ] );
 	        	modH->au8Buffer[ modH->u8BufferSize ] = lowByte( telegram.au16reg[ i/2 ] );
 	        }
 	        else
 	        {
-	        	 //modH->au8Buffer[  modH->u8BufferSize ] = highByte(modH->au16regs[ i/2] );
 	        	modH->au8Buffer[  modH->u8BufferSize ] = highByte( telegram.au16reg[ i/2 ] );
 
 	        }
@@ -447,10 +444,9 @@ int8_t SendQuery(modbusHandler_t *modH ,  modbus_t telegram )
 
 	    for (uint16_t i=0; i< telegram.u16CoilsNo; i++)
 	    {
-	        //modH->au8Buffer[  modH->u8BufferSize ] = highByte(  modH->au16regs[ i ] );
+
 	        modH->au8Buffer[  modH->u8BufferSize ] = highByte(  telegram.au16reg[ i ] );
 	        modH->u8BufferSize++;
-	        //modH->au8Buffer[  modH->u8BufferSize ] = lowByte(  modH->au16regs[ i ] );
 	        modH->au8Buffer[  modH->u8BufferSize ] = lowByte( telegram.au16reg[ i ] );
 	        modH->u8BufferSize++;
 	    }
@@ -692,30 +688,7 @@ int8_t getRxBuffer(modbusHandler_t *modH)
 
 
 
-/**
- * @brief
- * This is the callback for HAL interrupt of UART RX
- *
- * @ingroup UartHandle UART HAL handler
- */
-void HAL_UART_RxCpltCallback(UART_HandleTypeDef *UartHandle)
-{
-	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
 
-    int i;
-    for (i = 0; i < numberHandlers; i++ )
-    {
-    	if (mHandlers[i]->port == UartHandle  )
-    	{
-    		xQueueSendToBackFromISR( mHandlers[i]->QueueModbusHandle, &mHandlers[i]->dataRX, pdFALSE);
-    		HAL_UART_Receive_IT(mHandlers[i]->port, &mHandlers[i]->dataRX, 1);
-    		xTimerResetFromISR(mHandlers[i]->xTimerT35, &xHigherPriorityTaskWoken);
-    		break;
-    	}
-    }
-
-
-}
 
 /**
  * @brief

MODBUS-LIB/Src/UARTCallback.c

@@ -23,7 +23,7 @@
 
 void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
 {
-	/* Modbus RTU callback BEGIN */
+	/* Modbus RTU TX callback BEGIN */
 	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
 	int i;
 	for (i = 0; i < numberHandlers; i++ )
@@ -38,7 +38,44 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart)
 	}
 	portYIELD_FROM_ISR( xHigherPriorityTaskWoken );
 
-	/* Modbus RTU callback END */
+	/* Modbus RTU TX callback END */
+
+	/*
+	 * Here you should implement the callback code for other UARTs not used by Modbus
+	 *
+	 * */
+
+}
+
+
+
+/**
+ * @brief
+ * This is the callback for HAL interrupt of UART RX
+ * This callback is shared among all UARTS, if more interrupts are used
+ * user should implement the correct control flow and verification to maintain
+ * Modbus functionality.
+ * @ingroup UartHandle UART HAL handler
+ */
+void HAL_UART_RxCpltCallback(UART_HandleTypeDef *UartHandle)
+{
+	BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+
+	/* Modbus RTU RX callback BEGIN */
+    int i;
+    for (i = 0; i < numberHandlers; i++ )
+    {
+    	if (mHandlers[i]->port == UartHandle  )
+    	{
+    		xQueueSendToBackFromISR( mHandlers[i]->QueueModbusHandle, &mHandlers[i]->dataRX, pdFALSE);
+    		HAL_UART_Receive_IT(mHandlers[i]->port, &mHandlers[i]->dataRX, 1);
+    		xTimerResetFromISR(mHandlers[i]->xTimerT35, &xHigherPriorityTaskWoken);
+    		break;
+    	}
+    }
+    portYIELD_FROM_ISR( xHigherPriorityTaskWoken );
+
+	/* Modbus RTU RX callback END */
 
 	/*
 	 * Here you should implement the callback code for other UARTs not used by Modbus

ModbusF103/.settings/language.settings.xml

@@ -6,7 +6,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-463289872949268509" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1883483433282617244" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -18,7 +18,7 @@
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
 			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-463289872949268509" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1883483433282617244" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

ModbusF103/.settings/stm32cubeide.project.prefs

@@ -0,0 +1,4 @@
+2F62501ED4689FB349E356AB974DBE57=D2AF821F2242C732CCF04745471DAC4B
+8DF89ED150041C4CBC7CB9A9CAA90856=D2AF821F2242C732CCF04745471DAC4B
+DC22A860405A8BF2F2C095E5B6529F12=003FADF58D6016C21A751F138F49FA71
+eclipse.preferences.version=1

ModbusF103/Core/Src/main.c

@@ -95,14 +95,14 @@ int main(void)
   /* Master initialization */
   ModbusH.uiModbusType = MASTER_RTU;
   ModbusH.port =  &huart1;
-  ModbusH.u8id = 0; // Form master it must be 0
+  ModbusH.u8id = 0; // For master it must be 0
   ModbusH.u16timeOut = 1000;
   ModbusH.EN_Port = NULL;
   ModbusH.EN_Port = EN_485_GPIO_Port;
   ModbusH.EN_Pin = EN_485_Pin;
   ModbusH.u32overTime = 0;
   ModbusH.au16regs = ModbusDATA;
-  ModbusH.u8regsize= sizeof(ModbusDATA)/sizeof(ModbusDATA[0]);
+  ModbusH.u16regsize= sizeof(ModbusDATA)/sizeof(ModbusDATA[0]);
   //Initialize Modbus library
   ModbusInit(&ModbusH);
   //Start capturing traffic on serial Port
@@ -113,15 +113,15 @@ int main(void)
   /* Slave initialization */
 
   ModbusH2.uiModbusType = SLAVE_RTU;
-  ModbusH2.port =  &huart3;
+  ModbusH2.port =  &huart2;
   ModbusH2.u8id = 17;
   ModbusH2.u16timeOut = 1000;
   ModbusH2.EN_Port = NULL;
   //ModbusH2.EN_Port = LD2_GPIO_Port;
   //ModbusH2.EN_Pin = LD2_Pin;
   ModbusH2.u32overTime = 0;
   ModbusH2.au16regs = ModbusDATA2;
-  ModbusH2.u8regsize= sizeof(ModbusDATA2)/sizeof(ModbusDATA2[0]);
+  ModbusH2.u16regsize= sizeof(ModbusDATA2)/sizeof(ModbusDATA2[0]);
   //Initialize Modbus library
   ModbusInit(&ModbusH2);
   //Start capturing traffic on serial Port