diff --git a/EWARM/FreeModbus_Slave&Master+RTT+STM32.dep b/EWARM/FreeModbus_Slave&Master+RTT+STM32.dep index 7aaa5c9..adbb1c0 100644 --- a/EWARM/FreeModbus_Slave&Master+RTT+STM32.dep +++ b/EWARM/FreeModbus_Slave&Master+RTT+STM32.dep @@ -2,15 +2,15 @@ 2 - 1019841418 + 1811439652 Debug - $PROJ_DIR$\..\APP\inc\stm32f10x_conf.h + $PROJ_DIR$\..\APP\src\stm32f10x_it.c $PROJ_DIR$\..\APP\src\app.c $PROJ_DIR$\..\APP\src\app_task.c + $PROJ_DIR$\..\APP\inc\stm32f10x_conf.h $PROJ_DIR$\..\APP\src\cpuusage.c - $PROJ_DIR$\..\APP\src\stm32f10x_it.c $PROJ_DIR$\..\RT-Thread-1.1.1\libcpu\arm\common\backtrace.c $PROJ_DIR$\..\RT-Thread-1.1.1\libcpu\arm\cortex-m3\context_iar.S $PROJ_DIR$\..\BSP\src\bsp.c @@ -18,6 +18,7 @@ $PROJ_DIR$\..\FreeModbus\modbus\mb.c $PROJ_DIR$\..\RT-Thread-1.1.1\libcpu\arm\common\showmem.c $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c + $PROJ_DIR$\..\FreeModbus\modbus\mb_m.c $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbcrc.c $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfunccoils.c $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdiag.c @@ -26,12 +27,15 @@ $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncother.c $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncinput.c $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu.c + $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu_m.c $PROJ_DIR$\..\FreeModbus\modbus\functions\mbutils.c $PROJ_DIR$\..\FreeModbus\port\port.c - $PROJ_DIR$\..\FreeModbus\port\port.h $PROJ_DIR$\..\FreeModbus\port\portevent.c + $PROJ_DIR$\..\FreeModbus\port\portevent_m.c $PROJ_DIR$\..\FreeModbus\port\portserial.c + $PROJ_DIR$\..\FreeModbus\port\portserial_m.c $PROJ_DIR$\..\FreeModbus\port\porttimer.c + $PROJ_DIR$\..\FreeModbus\port\porttimer_m.c $PROJ_DIR$\..\FreeModbus\port\user_app_s.c $PROJ_DIR$\..\RT-Thread-1.1.1\src\clock.c $PROJ_DIR$\..\RT-Thread-1.1.1\src\device.c @@ -72,67 +76,16 @@ $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c - $PROJ_DIR$\Debug\Obj\user_app_s.pbi - $PROJ_DIR$\..\Libaries\CMSIS_EWARM\Include\core_cm3.h - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_rcc.h - $TOOLKIT_DIR$\inc\c\cmsis_iar.h - $PROJ_DIR$\..\Libaries\CMSIS_EWARM\Include\core_cmInstr.h - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_flash.h - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_exti.h - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\misc.h - $PROJ_DIR$\Debug\Obj\user_app_s.o - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_gpio.h - $TOOLKIT_DIR$\inc\c\stdlib.h - $PROJ_DIR$\..\APP\inc\rtconfig.h - $PROJ_DIR$\Debug\Obj\stm32f10x_flash.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.pbi - $PROJ_DIR$\Debug\Obj\stm32f10x_usart.pbi - $TOOLKIT_DIR$\inc\c\stdio.h - $TOOLKIT_DIR$\inc\c\ysizet.h - $PROJ_DIR$\Debug\Obj\stm32f10x_pwr.pbi - $TOOLKIT_DIR$\inc\c\yvals.h - $TOOLKIT_DIR$\inc\c\ystdio.h - $PROJ_DIR$\Debug\Obj\cpuusage.pbi - $PROJ_DIR$\Debug\Obj\cpuusage.o - $PROJ_DIR$\Debug\Obj\mbrtu_m.pbi - $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu_m.c - $PROJ_DIR$\Debug\Obj\mbrtu_m.o - $PROJ_DIR$\..\FreeModbus\port\porttimer_m.c - $PROJ_DIR$\..\APP\inc\cpuusage.h - $PROJ_DIR$\..\APP\inc\delay_conf.h - $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtdebug.h - $PROJ_DIR$\..\RT-Thread-1.1.1\include\rthw.h - $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtservice.h - $PROJ_DIR$\Debug\Obj\cpuport.o - $PROJ_DIR$\Debug\Obj\memheap.pbi - $PROJ_DIR$\Debug\Obj\cpuport.pbi - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_usart.h - $PROJ_DIR$\..\BSP\inc\bsp.h - $PROJ_DIR$\Debug\Obj\mbcrc.pbi - $PROJ_DIR$\Debug\Exe\FreeModbus_Slaver&Master+RTT+STM32.out - $PROJ_DIR$\Debug\Obj\memheap.o - $TOOLKIT_DIR$\inc\c\ycheck.h - $PROJ_DIR$\Debug\Obj\mbrtu.o - $PROJ_DIR$\Debug\Obj\mbcrc.o - $PROJ_DIR$\..\FreeModbus\port\user_app.h - $TOOLKIT_DIR$\inc\c\stdint.h - $PROJ_DIR$\Debug\Obj\FreeModbus_Slave&Master+RTT+STM32.pbd - $TOOLKIT_DIR$\inc\c\stdarg.h - $PROJ_DIR$\Debug\Obj\showmem.o - $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtm.h - $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtthread.h - $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtdef.h - $PROJ_DIR$\Debug\Obj\showmem.pbi - $PROJ_DIR$\Debug\Obj\backtrace.o - $PROJ_DIR$\Debug\Obj\backtrace.pbi + $PROJ_DIR$\Debug\Obj\mb_m.pbi $PROJ_DIR$\Debug\Obj\mbfuncdiag.pbi - $PROJ_DIR$\Debug\Obj\mbfunccoils.pbi - $PROJ_DIR$\Debug\Obj\mbfuncinput.o + $PROJ_DIR$\Debug\Obj\backtrace.o $PROJ_DIR$\Debug\Obj\mbfuncother.o - $PROJ_DIR$\Debug\Obj\mbutils.o $PROJ_DIR$\Debug\Obj\mbfuncdiag.o + $PROJ_DIR$\Debug\Obj\mbutils.o + $PROJ_DIR$\Debug\Obj\mbfuncinput.o $PROJ_DIR$\Debug\Obj\startup_stm32f10x_md.o + $PROJ_DIR$\Debug\Obj\mbfunccoils.pbi + $PROJ_DIR$\Debug\Obj\backtrace.pbi $PROJ_DIR$\Debug\Obj\mbfunccoils.o $PROJ_DIR$\Debug\Obj\mbfuncdisc.o $PROJ_DIR$\Debug\Obj\mbutils.pbi @@ -143,27 +96,20 @@ $PROJ_DIR$\Debug\Obj\mbfuncholding.o $PROJ_DIR$\Debug\Obj\mb.pbi $PROJ_DIR$\Debug\Obj\mb.o - $TOOLKIT_DIR$\inc\c\assert.h - $PROJ_DIR$\Debug\Obj\portserial.pbi $PROJ_DIR$\Debug\Obj\portserial_m.pbi + $PROJ_DIR$\Debug\Obj\portserial.pbi $PROJ_DIR$\Debug\Obj\porttimer_m.pbi $PROJ_DIR$\Debug\Obj\portevent_m.pbi $PROJ_DIR$\Debug\Obj\portevent_m.o $PROJ_DIR$\Debug\Obj\porttimer_m.o $PROJ_DIR$\Debug\Obj\portserial_m.o - $PROJ_DIR$\..\FreeModbus\port\portserial_m.c - $PROJ_DIR$\..\FreeModbus\port\portevent_m.c $PROJ_DIR$\Debug\Obj\portevent.pbi $PROJ_DIR$\Debug\Obj\porttimer.o $PROJ_DIR$\Debug\Obj\portevent.o $PROJ_DIR$\Debug\Obj\portserial.o $PROJ_DIR$\Debug\Obj\port.o $PROJ_DIR$\Debug\Obj\porttimer.pbi - $TOOLKIT_DIR$\inc\c\inttypes.h $PROJ_DIR$\Debug\Obj\port.pbi - $PROJ_DIR$\..\FreeModbus\modbus\include\mbproto.h - $PROJ_DIR$\..\FreeModbus\modbus\include\mb.h - $PROJ_DIR$\..\FreeModbus\modbus\include\mbport.h $PROJ_DIR$\Debug\Obj\mbrtu.pbi $PROJ_DIR$\Debug\Obj\stm32f10x_cec.o $PROJ_DIR$\Debug\Obj\scheduler.o @@ -193,33 +139,45 @@ $PROJ_DIR$\Debug\Obj\kservice.o $PROJ_DIR$\Debug\Obj\device.o $PROJ_DIR$\Debug\Obj\clock.o - $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h $PROJ_DIR$\Debug\Obj\idle.o - $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h $PROJ_DIR$\Debug\Obj\bsp.pbi $PROJ_DIR$\Debug\Obj\app.pbi $PROJ_DIR$\Debug\Obj\system_stm32f10x.o - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_iwdg.h $PROJ_DIR$\Debug\Obj\app.o $PROJ_DIR$\Debug\Obj\context_iar.o $PROJ_DIR$\Debug\Obj\stm32f10x_it.o $PROJ_DIR$\Debug\Obj\app_task.o - $TOOLKIT_DIR$\inc\c\xencoding_limits.h - $TOOLKIT_DIR$\inc\c\DLib_Defaults.h $PROJ_DIR$\Debug\Obj\ipc.o - $PROJ_DIR$\..\APP\inc\app_task.h $PROJ_DIR$\Debug\Obj\stm32f10x_it.pbi - $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h - $PROJ_DIR$\Debug\Obj\system_stm32f10x.pbi - $TOOLKIT_DIR$\inc\c\DLib_Product.h - $PROJ_DIR$\Debug\Obj\irq.o $PROJ_DIR$\Debug\Obj\bsp.o + $PROJ_DIR$\Debug\Obj\system_stm32f10x.pbi + $PROJ_DIR$\Debug\Obj\irq.o $PROJ_DIR$\Debug\Obj\stm32f10x_dac.pbi - $TOOLKIT_DIR$\inc\c\DLib_Threads.h - $PROJ_DIR$\Debug\Obj\app_task.pbi $PROJ_DIR$\Debug\Obj\stm32f10x_dbgmcu.pbi + $PROJ_DIR$\Debug\Obj\app_task.pbi $PROJ_DIR$\Debug\Obj\stm32f10x_sdio.pbi $PROJ_DIR$\Debug\Obj\stm32f10x_i2c.o + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_tim.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_flash.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_gpio.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\misc.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_iwdg.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_rcc.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_usart.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_exti.h + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_dma.h + $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.h + $TOOLKIT_DIR$\inc\c\intrinsics.h + $TOOLKIT_DIR$\inc\c\cmsis_iar.h + $PROJ_DIR$\..\Libaries\CMSIS_EWARM\Include\core_cmFunc.h + $TOOLKIT_DIR$\inc\c\DLib_Threads.h + $TOOLKIT_DIR$\inc\c\xencoding_limits.h + $TOOLKIT_DIR$\inc\c\DLib_Product.h + $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $TOOLKIT_DIR$\inc\c\yvals.h + $PROJ_DIR$\..\Libaries\CMSIS_EWARM\Include\core_cmInstr.h + $TOOLKIT_DIR$\inc\c\ycheck.h $PROJ_DIR$\Debug\Obj\mempool.o $PROJ_DIR$\Debug\Obj\stm32f10x_dma.pbi $PROJ_DIR$\Debug\Obj\stm32f10x_exti.pbi @@ -246,6 +204,28 @@ $PROJ_DIR$\Debug\Obj\stm32f10x_can.o $PROJ_DIR$\Debug\Obj\stm32f10x_tim.o $PROJ_DIR$\Debug\Obj\stm32f10x_pwr.o + $PROJ_DIR$\Debug\Obj\stm32f10x_flash.pbi + $PROJ_DIR$\Debug\Obj\user_app_s.pbi + $PROJ_DIR$\Debug\Obj\user_app_s.o + $PROJ_DIR$\Debug\Obj\stm32f10x_wwdg.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_rcc.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_usart.pbi + $PROJ_DIR$\Debug\Obj\stm32f10x_pwr.pbi + $PROJ_DIR$\Debug\Obj\cpuusage.pbi + $PROJ_DIR$\Debug\Obj\cpuusage.o + $PROJ_DIR$\Debug\Obj\mbrtu_m.pbi + $PROJ_DIR$\Debug\Obj\mbrtu_m.o + $PROJ_DIR$\Debug\Obj\cpuport.o + $PROJ_DIR$\Debug\Obj\memheap.pbi + $PROJ_DIR$\Debug\Obj\cpuport.pbi + $PROJ_DIR$\Debug\Obj\mbcrc.pbi + $PROJ_DIR$\Debug\Obj\mbcrc.o + $PROJ_DIR$\Debug\Obj\mbrtu.o + $PROJ_DIR$\Debug\Exe\FreeModbus_Slaver&Master+RTT+STM32.out + $PROJ_DIR$\Debug\Obj\memheap.o + $PROJ_DIR$\Debug\Obj\showmem.pbi + $PROJ_DIR$\Debug\Obj\FreeModbus_Slave&Master+RTT+STM32.pbd + $PROJ_DIR$\Debug\Obj\showmem.o $PROJ_DIR$\Debug\Obj\stm32f10x_usart.o $PROJ_DIR$\Debug\Obj\stm32f10x_iwdg.o $PROJ_DIR$\Debug\Obj\stm32f10x_spi.o @@ -254,37 +234,81 @@ $PROJ_DIR$\Debug\Obj\stm32f10x_cec.pbi $PROJ_DIR$\Debug\Obj\stm32f10x_can.pbi $PROJ_DIR$\Debug\Obj\stm32f10x_bkp.pbi - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_tim.h + $PROJ_DIR$\Debug\Obj\mb_m.o + $PROJ_DIR$\..\FreeModbus\modbus\include\mbconfig.h $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_adc.h - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_dma.h - $TOOLKIT_DIR$\inc\c\intrinsics.h - $PROJ_DIR$\..\Libaries\CMSIS_EWARM\Include\core_cmFunc.h + $PROJ_DIR$\..\FreeModbus\port\port.h + $PROJ_DIR$\..\FreeModbus\modbus\include\mb.h + $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\stm32f10x.h + $PROJ_DIR$\..\Libaries\CMSIS_EWARM\Include\core_cm3.h + $PROJ_DIR$\..\RT-Thread-1.1.1\include\rthw.h + $TOOLKIT_DIR$\inc\c\stdint.h + $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtthread.h + $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtdef.h + $PROJ_DIR$\..\APP\inc\rtconfig.h + $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtdebug.h + $TOOLKIT_DIR$\inc\c\stdarg.h + $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtservice.h + $PROJ_DIR$\..\RT-Thread-1.1.1\include\rtm.h + $PROJ_DIR$\..\FreeModbus\modbus\include\mbport.h + $TOOLKIT_DIR$\inc\c\assert.h + $TOOLKIT_DIR$\inc\c\inttypes.h + $PROJ_DIR$\..\FreeModbus\modbus\include\mbproto.h + $PROJ_DIR$\..\FreeModbus\port\user_app.h + $PROJ_DIR$\..\APP\inc\cpuusage.h + $PROJ_DIR$\..\APP\inc\delay_conf.h + $TOOLKIT_DIR$\inc\c\ystdio.h + $PROJ_DIR$\..\BSP\inc\bsp.h + $PROJ_DIR$\..\APP\inc\app_task.h + $TOOLKIT_DIR$\inc\c\stdio.h + $PROJ_DIR$\..\APP\inc\stm32f10x_it.h + $TOOLKIT_DIR$\inc\c\ysizet.h + $TOOLKIT_DIR$\inc\c\stdlib.h [ROOT_NODE] ILINK - 104 + 215 + + $PROJ_DIR$\..\APP\src\stm32f10x_it.c + + + ICCARM + 139 + + + BICOMP + 142 + + + + + BICOMP + 255 252 3 230 233 234 236 171 169 168 167 166 165 164 170 162 161 163 160 159 158 152 153 155 156 151 157 154 237 238 239 241 240 242 243 250 + + + $PROJ_DIR$\..\APP\src\app.c ICCARM - 194 + 137 BICOMP - 191 + 135 BICOMP - 201 76 106 85 199 203 205 198 209 83 82 86 96 115 116 77 112 95 97 114 0 249 187 67 110 70 69 251 252 189 250 72 71 75 193 68 248 101 73 102 94 93 109 156 22 137 153 157 155 + 253 257 171 169 168 167 166 165 164 256 254 251 235 237 238 239 241 240 242 243 3 230 233 234 236 170 162 161 163 160 159 158 152 153 155 156 151 157 154 252 250 249 248 232 231 229 245 246 244 247 @@ -293,17 +317,17 @@ ICCARM - 197 + 140 BICOMP - 210 + 148 BICOMP - 201 76 106 85 199 203 205 198 209 83 82 86 96 115 116 77 112 95 97 114 0 249 187 67 110 70 69 251 252 189 250 72 71 75 193 68 248 101 73 102 94 93 109 156 22 137 153 157 155 + 253 257 171 169 168 167 166 165 164 256 254 251 235 237 238 239 241 240 242 243 3 230 233 234 236 170 162 161 163 160 159 158 152 153 155 156 151 157 154 252 250 249 248 232 231 229 245 246 244 247 @@ -312,52 +336,45 @@ ICCARM - 88 + 206 BICOMP - 87 + 205 BICOMP - 115 116 77 112 106 85 199 203 205 198 209 95 97 114 96 93 + 237 238 239 241 171 169 168 167 166 165 164 240 242 243 235 249 - - $PROJ_DIR$\..\APP\src\stm32f10x_it.c - - - ICCARM - 196 - - - BICOMP - 202 - - - $PROJ_DIR$\..\RT-Thread-1.1.1\libcpu\arm\common\backtrace.c ICCARM - 118 + 72 BICOMP - 119 + 79 + + + BICOMP + 237 238 239 241 171 169 168 167 166 165 164 240 242 243 + + $PROJ_DIR$\..\RT-Thread-1.1.1\libcpu\arm\cortex-m3\context_iar.S AARM - 195 + 138 @@ -366,37 +383,49 @@ ICCARM - 207 + 143 BICOMP - 190 + 134 + + + BICOMP + 252 3 230 233 234 236 171 169 168 167 166 165 164 170 162 161 163 160 159 158 152 153 155 156 151 157 154 235 237 238 239 241 240 242 243 248 232 231 229 245 246 244 247 + + $PROJ_DIR$\..\RT-Thread-1.1.1\libcpu\arm\cortex-m3\cpuport.c ICCARM - 98 + 209 BICOMP - 100 + 211 + + + BICOMP + 237 238 239 241 171 169 168 167 166 165 164 240 242 243 + + $PROJ_DIR$\..\FreeModbus\modbus\mb.c ICCARM - 136 + 89 BICOMP - 135 + 88 @@ -405,654 +434,59 @@ ICCARM - 113 + 219 BICOMP - 117 + 217 + + + BICOMP + 237 238 239 241 171 169 168 167 166 165 164 240 242 243 + + $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c ICCARM - 192 + 136 BICOMP - 204 + 144 + + + + + BICOMP + 233 234 236 171 169 168 167 166 165 164 170 162 161 163 160 3 230 159 158 152 153 155 156 151 157 154 + + + + + $PROJ_DIR$\..\FreeModbus\modbus\mb_m.c + + + ICCARM + 228 + + + BICOMP + 70 $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbcrc.c - - - ICCARM - 108 - - - BICOMP - 103 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfunccoils.c - - - ICCARM - 127 - - - BICOMP - 121 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdiag.c - - - ICCARM - 125 - - - BICOMP - 120 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdisc.c - - - ICCARM - 128 - - - BICOMP - 132 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncholding.c - - - ICCARM - 134 - - - BICOMP - 130 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncother.c - - - ICCARM - 123 - - - BICOMP - 133 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncinput.c - - - ICCARM - 122 - - - BICOMP - 131 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu.c - - - ICCARM - 107 - - - BICOMP - 158 - - - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbutils.c - - - ICCARM - 124 - - - BICOMP - 129 - - - - - $PROJ_DIR$\..\FreeModbus\port\port.c - - - ICCARM - 151 - - - BICOMP - 154 - - - - - $PROJ_DIR$\..\FreeModbus\port\portevent.c - - - ICCARM - 149 - - - BICOMP - 147 - - - - - $PROJ_DIR$\..\FreeModbus\port\portserial.c - - - ICCARM - 150 - - - BICOMP - 138 - - - - - $PROJ_DIR$\..\FreeModbus\port\porttimer.c - - - ICCARM - 148 - - - BICOMP - 152 - - - - - $PROJ_DIR$\..\FreeModbus\port\user_app_s.c - - - ICCARM - 74 - - - BICOMP - 66 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\clock.c - - - ICCARM - 186 - - - BICOMP - 178 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\device.c - - - ICCARM - 185 - - - BICOMP - 176 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\idle.c - - - ICCARM - 188 - - - BICOMP - 174 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\ipc.c - - - ICCARM - 200 - - - BICOMP - 175 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\irq.c - - - ICCARM - 206 - - - BICOMP - 173 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\kservice.c - - - ICCARM - 184 - - - BICOMP - 164 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\mem.c - - - ICCARM - 183 - - - BICOMP - 166 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\memheap.c - - - ICCARM - 105 - - - BICOMP - 99 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\mempool.c - - - ICCARM - 214 - - - BICOMP - 168 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\module.c - - - ICCARM - 161 - - - BICOMP - 167 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\object.c - - - ICCARM - 182 - - - BICOMP - 162 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\scheduler.c - - - ICCARM - 160 - - - BICOMP - 165 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\slab.c - - - ICCARM - 181 - - - BICOMP - 163 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\thread.c - - - ICCARM - 180 - - - BICOMP - 170 - - - - - $PROJ_DIR$\..\RT-Thread-1.1.1\src\timer.c - - - ICCARM - 179 - - - BICOMP - 169 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\misc.c - - - ICCARM - 172 - - - BICOMP - 243 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c - - - ICCARM - 171 - - - BICOMP - 231 - - - - - $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s - - - AARM - 126 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c - - - ICCARM - 219 - - - BICOMP - 247 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c - - - ICCARM - 237 - - - BICOMP - 246 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c - - - ICCARM - 159 - - - BICOMP - 245 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c - - - ICCARM - 177 - - - BICOMP - 244 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c - - - ICCARM - 236 - - - BICOMP - 208 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c - - - ICCARM - 232 - - - BICOMP - 211 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c - - - ICCARM - 235 - - - BICOMP - 215 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c - - - ICCARM - 234 - - - BICOMP - 216 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c - - - ICCARM - 233 - - - BICOMP - 78 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c - - - ICCARM - 221 - - - BICOMP - 218 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c - - - ICCARM - 230 - - - BICOMP - 217 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c ICCARM 213 - - BICOMP - 220 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c - - - ICCARM - 241 - - - BICOMP - 223 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c - - - ICCARM - 239 - - - BICOMP - 84 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c - - - ICCARM - 227 - - - BICOMP - 80 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c - - - ICCARM - 226 - - - BICOMP - 222 - - - - - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c - - - ICCARM - 228 - BICOMP 212 @@ -1060,54 +494,93 @@ - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfunccoils.c ICCARM - 242 + 80 BICOMP - 224 + 78 - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdiag.c ICCARM - 238 + 74 BICOMP - 225 + 71 - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdisc.c ICCARM - 240 - - - BICOMP 81 + + BICOMP + 85 + - $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncholding.c ICCARM - 229 + 87 BICOMP - 79 + 83 + + + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncother.c + + + ICCARM + 73 + + + BICOMP + 86 + + + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncinput.c + + + ICCARM + 76 + + + BICOMP + 84 + + + + + $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu.c + + + ICCARM + 214 + + + BICOMP + 104 @@ -1116,37 +589,50 @@ ICCARM - 91 + 208 BICOMP - 89 + 207 - $PROJ_DIR$\..\FreeModbus\port\porttimer_m.c + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbutils.c ICCARM - 143 + 75 BICOMP - 140 + 82 - $PROJ_DIR$\..\FreeModbus\port\portserial_m.c + $PROJ_DIR$\..\FreeModbus\port\port.c ICCARM - 144 + 101 BICOMP - 139 + 103 + + + + + $PROJ_DIR$\..\FreeModbus\port\portevent.c + + + ICCARM + 99 + + + BICOMP + 97 @@ -1155,12 +641,580 @@ ICCARM - 142 + 94 BICOMP + 93 + + + + + $PROJ_DIR$\..\FreeModbus\port\portserial.c + + + ICCARM + 100 + + + BICOMP + 91 + + + + + $PROJ_DIR$\..\FreeModbus\port\portserial_m.c + + + ICCARM + 96 + + + BICOMP + 90 + + + + + $PROJ_DIR$\..\FreeModbus\port\porttimer.c + + + ICCARM + 98 + + + BICOMP + 102 + + + + + $PROJ_DIR$\..\FreeModbus\port\porttimer_m.c + + + ICCARM + 95 + + + BICOMP + 92 + + + + + $PROJ_DIR$\..\FreeModbus\port\user_app_s.c + + + ICCARM + 200 + + + BICOMP + 199 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\clock.c + + + ICCARM + 132 + + + BICOMP + 124 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\device.c + + + ICCARM + 131 + + + BICOMP + 122 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\idle.c + + + ICCARM + 133 + + + BICOMP + 120 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\ipc.c + + + ICCARM 141 + + BICOMP + 121 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\irq.c + + + ICCARM + 145 + + + BICOMP + 119 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\kservice.c + + + ICCARM + 130 + + + BICOMP + 110 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\mem.c + + + ICCARM + 129 + + + BICOMP + 112 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\memheap.c + + + ICCARM + 216 + + + BICOMP + 210 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\mempool.c + + + ICCARM + 172 + + + BICOMP + 114 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\module.c + + + ICCARM + 107 + + + BICOMP + 113 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\object.c + + + ICCARM + 128 + + + BICOMP + 108 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\scheduler.c + + + ICCARM + 106 + + + BICOMP + 111 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\slab.c + + + ICCARM + 127 + + + BICOMP + 109 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\thread.c + + + ICCARM + 126 + + + BICOMP + 116 + + + + + $PROJ_DIR$\..\RT-Thread-1.1.1\src\timer.c + + + ICCARM + 125 + + + BICOMP + 115 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\misc.c + + + ICCARM + 118 + + + BICOMP + 223 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c + + + ICCARM + 117 + + + BICOMP + 189 + + + + + $PROJ_DIR$\..\Libaries\CMSIS_EWARM\CM3\DeviceSupport\ST\STM32F10x\startup\iar\startup_stm32f10x_md.s + + + AARM + 77 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c + + + ICCARM + 177 + + + BICOMP + 227 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c + + + ICCARM + 195 + + + BICOMP + 226 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c + + + ICCARM + 105 + + + BICOMP + 225 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c + + + ICCARM + 123 + + + BICOMP + 224 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c + + + ICCARM + 194 + + + BICOMP + 146 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c + + + ICCARM + 190 + + + BICOMP + 147 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c + + + ICCARM + 193 + + + BICOMP + 173 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c + + + ICCARM + 192 + + + BICOMP + 174 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c + + + ICCARM + 191 + + + BICOMP + 198 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c + + + ICCARM + 179 + + + BICOMP + 176 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c + + + ICCARM + 188 + + + BICOMP + 175 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c + + + ICCARM + 150 + + + BICOMP + 178 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c + + + ICCARM + 221 + + + BICOMP + 181 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c + + + ICCARM + 197 + + + BICOMP + 204 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c + + + ICCARM + 185 + + + BICOMP + 202 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c + + + ICCARM + 184 + + + BICOMP + 180 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c + + + ICCARM + 186 + + + BICOMP + 149 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c + + + ICCARM + 222 + + + BICOMP + 182 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c + + + ICCARM + 196 + + + BICOMP + 183 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c + + + ICCARM + 220 + + + BICOMP + 203 + + + + + $PROJ_DIR$\..\Libaries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c + + + ICCARM + 187 + + + BICOMP + 201 + diff --git a/EWARM/FreeModbus_Slave&Master+RTT+STM32.ewp b/EWARM/FreeModbus_Slave&Master+RTT+STM32.ewp index 0e225f8..358cd20 100644 --- a/EWARM/FreeModbus_Slave&Master+RTT+STM32.ewp +++ b/EWARM/FreeModbus_Slave&Master+RTT+STM32.ewp @@ -1886,64 +1886,82 @@ - FreeModbusSlaver - - $PROJ_DIR$\..\FreeModbus\modbus\mb.c - - - $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbcrc.c - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfunccoils.c - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdiag.c - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdisc.c - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncholding.c - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncinput.c - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncother.c - - - $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu.c - - - $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu_m.c - - - $PROJ_DIR$\..\FreeModbus\modbus\functions\mbutils.c - - - $PROJ_DIR$\..\FreeModbus\port\port.c - - - $PROJ_DIR$\..\FreeModbus\port\portevent.c - - - $PROJ_DIR$\..\FreeModbus\port\portevent_m.c - - - $PROJ_DIR$\..\FreeModbus\port\portserial.c - - - $PROJ_DIR$\..\FreeModbus\port\portserial_m.c - - - $PROJ_DIR$\..\FreeModbus\port\porttimer.c - - - $PROJ_DIR$\..\FreeModbus\port\porttimer_m.c - - - $PROJ_DIR$\..\FreeModbus\port\user_app_s.c - + FreeModbusMaster + + Modbus + + $PROJ_DIR$\..\FreeModbus\modbus\mb_m.c + + + $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu_m.c + + + + Port + + $PROJ_DIR$\..\FreeModbus\port\portevent_m.c + + + $PROJ_DIR$\..\FreeModbus\port\portserial_m.c + + + $PROJ_DIR$\..\FreeModbus\port\porttimer_m.c + + + + + FreeModbusSlave + + Modbus + + $PROJ_DIR$\..\FreeModbus\modbus\mb.c + + + $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbcrc.c + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfunccoils.c + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdiag.c + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncdisc.c + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncholding.c + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncinput.c + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbfuncother.c + + + $PROJ_DIR$\..\FreeModbus\modbus\rtu\mbrtu.c + + + $PROJ_DIR$\..\FreeModbus\modbus\functions\mbutils.c + + + + Port + + $PROJ_DIR$\..\FreeModbus\port\port.c + + + $PROJ_DIR$\..\FreeModbus\port\portevent.c + + + $PROJ_DIR$\..\FreeModbus\port\portserial.c + + + $PROJ_DIR$\..\FreeModbus\port\porttimer.c + + + $PROJ_DIR$\..\FreeModbus\port\user_app_s.c + + RT-Thread Kernel diff --git a/EWARM/settings/FreeModbus_Slave&Master+RTT+STM32.wsdt b/EWARM/settings/FreeModbus_Slave&Master+RTT+STM32.wsdt index c2e8401..6c3a7d7 100644 --- a/EWARM/settings/FreeModbus_Slave&Master+RTT+STM32.wsdt +++ b/EWARM/settings/FreeModbus_Slave&Master+RTT+STM32.wsdt @@ -17,7 +17,7 @@ 20121532481191622 - + TabID-30370-1297 @@ -29,7 +29,7 @@ - 0TabID-24390-6730BuildBuild0 + 0TabID-24390-6730BuildBuild0 @@ -42,7 +42,7 @@ - iaridepm.enu1-2-2772451-2-2456101271429104339269643799587-2-21511682-2-216841531002381158058271429104339 + iaridepm.enu1-2-2725451-2-2456101271429104339269643751033-2-21981682-2-216842001002381206612271429104339 diff --git a/FreeModbus/modbus/mb.c b/FreeModbus/modbus/mb.c index 8fca754..37e2adb 100644 --- a/FreeModbus/modbus/mb.c +++ b/FreeModbus/modbus/mb.c @@ -80,16 +80,6 @@ static pvMBFrameStop pvMBFrameStopCur; static peMBFrameReceive peMBFrameReceiveCur; static pvMBFrameClose pvMBFrameCloseCur; -/* Functions pointer which are initialized in eMBInit( ). Depending on the - * mode (RTU or ASCII) the are set to the correct implementations. - * Using for Modbus Master,Add by Armink 20130813 - */ -static peMBFrameSend peMBMasterFrameSendCur; -static pvMBFrameStart pvMBMasterFrameStartCur; -static pvMBFrameStop pvMBMasterFrameStopCur; -static peMBFrameReceive peMBMasterFrameReceiveCur; -static pvMBFrameClose pvMBMasterFrameCloseCur; - /* Callback functions required by the porting layer. They are called when * an external event has happend which includes a timeout or the reception * or transmission of a character. @@ -102,18 +92,6 @@ BOOL( *pxMBPortCBTimerExpired ) ( void ); BOOL( *pxMBFrameCBReceiveFSMCur ) ( void ); BOOL( *pxMBFrameCBTransmitFSMCur ) ( void ); -/* Callback functions required by the porting layer. They are called when - * an external event has happend which includes a timeout or the reception - * or transmission of a character. - * Using for Modbus Master,Add by Armink 20130813 - */ -BOOL( *pxMBMasterFrameCBByteReceived ) ( void ); -BOOL( *pxMBMasterFrameCBTransmitterEmpty ) ( void ); -BOOL( *pxMBMasterPortCBTimerExpired ) ( void ); - -BOOL( *pxMBMasterFrameCBReceiveFSMCur ) ( void ); -BOOL( *pxMBMasterFrameCBTransmitFSMCur ) ( void ); - /* An array of Modbus functions handlers which associates Modbus function * codes with implementing functions. */ @@ -248,64 +226,6 @@ eMBTCPInit( USHORT ucTCPPort ) } #endif -#if MB_MASTER_RTU_ENABLED > 0 -eMBErrorCode -eMBMasterInit( eMBMode eMode, UCHAR ucPort, ULONG ulBaudRate, eMBParity eParity ) -{ - eMBErrorCode eStatus = MB_ENOERR; - - switch (eMode) - { -#if MB_MASTER_RTU_ENABLED > 0 - case MB_RTU: - pvMBMasterFrameStartCur = eMBMasterRTUStart; - pvMBMasterFrameStopCur = eMBMasterRTUStop; - peMBMasterFrameSendCur = eMBMasterRTUSend; - peMBMasterFrameReceiveCur = eMBMasterRTUReceive; - pvMBMasterFrameCloseCur = MB_PORT_HAS_CLOSE ? vMBMasterPortClose : NULL; - pxMBMasterFrameCBByteReceived = xMBMasterRTUReceiveFSM; - pxMBMasterFrameCBTransmitterEmpty = xMBMasterRTUTransmitFSM; - pxMBMasterPortCBTimerExpired = xMBMasterRTUTimerT35Expired; - - eStatus = eMBMasterRTUInit(ucPort, ulBaudRate, eParity); - break; -#endif -#if MB_MASTER_ASCII_ENABLED > 0 - case MB_ASCII: - pvMBMasterFrameStartCur = eMBMasterASCIIStart; - pvMBMasterFrameStopCur = eMBMasterASCIIStop; - peMBMasterFrameSendCur = eMBMasterASCIISend; - peMBMasterFrameReceiveCur = eMBMasterASCIIReceive; - pvMBMasterFrameCloseCur = MB_PORT_HAS_CLOSE ? vMBMasterPortClose : NULL; - pxMBMasterFrameCBByteReceived = xMBMasterASCIIReceiveFSM; - pxMBMasterFrameCBTransmitterEmpty = xMBMasterASCIITransmitFSM; - pxMBMasterPortCBTimerExpired = xMBMasterASCIITimerT1SExpired; - - eStatus = eMBMasterASCIIInit(ucPort, ulBaudRate, eParity ); - break; -#endif - default: - eStatus = MB_EINVAL; - break; - } - - if (eStatus == MB_ENOERR) - { - if (!xMBMasterPortEventInit()) - { - /* port dependent event module initalization failed. */ - eStatus = MB_EPORTERR; - } - else - { - eMBCurrentMode = eMode; - eMBState = STATE_DISABLED; - } - } - return eStatus; -} -#endif - eMBErrorCode eMBRegisterCB( UCHAR ucFunctionCode, pxMBFunctionHandler pxHandler ) { @@ -372,26 +292,6 @@ eMBClose( void ) return eStatus; } -#if MB_MASTER_RTU_ENABLED > 0 -eMBErrorCode -eMBMasterClose( void ) -{ - eMBErrorCode eStatus = MB_ENOERR; - - if( eMBState == STATE_DISABLED ) - { - if( pvMBMasterFrameCloseCur != NULL ) - { - pvMBMasterFrameCloseCur( ); - } - } - else - { - eStatus = MB_EILLSTATE; - } - return eStatus; -} -#endif eMBErrorCode eMBEnable( void ) @@ -411,26 +311,6 @@ eMBEnable( void ) return eStatus; } -#if MB_MASTER_RTU_ENABLED > 0 -eMBErrorCode -eMBMasterEnable( void ) -{ - eMBErrorCode eStatus = MB_ENOERR; - - if( eMBState == STATE_DISABLED ) - { - /* Activate the protocol stack. */ - pvMBMasterFrameStartCur( ); - eMBState = STATE_ENABLED; - } - else - { - eStatus = MB_EILLSTATE; - } - return eStatus; -} -#endif - eMBErrorCode eMBDisable( void ) { @@ -453,30 +333,6 @@ eMBDisable( void ) return eStatus; } -#if MB_MASTER_RTU_ENABLED > 0 -eMBErrorCode -eMBMasterDisable( void ) -{ - eMBErrorCode eStatus; - - if( eMBState == STATE_ENABLED ) - { - pvMBMasterFrameStopCur( ); - eMBState = STATE_DISABLED; - eStatus = MB_ENOERR; - } - else if( eMBState == STATE_DISABLED ) - { - eStatus = MB_ENOERR; - } - else - { - eStatus = MB_EILLSTATE; - } - return eStatus; -} -#endif - eMBErrorCode eMBPoll( void ) { static UCHAR *ucMBFrame; diff --git a/FreeModbus/modbus/mb_m.c b/FreeModbus/modbus/mb_m.c new file mode 100644 index 0000000..a03326c --- /dev/null +++ b/FreeModbus/modbus/mb_m.c @@ -0,0 +1,330 @@ +/* + * FreeModbus Libary: A portable Modbus implementation for Modbus ASCII/RTU. + * Copyright (C) 2013 Armink + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * File: $Id: mbrtu_m.c,v 1.60 2013/08/20 11:18:10 Armink Add Master Functions , $ + */ + +/* ----------------------- System includes ----------------------------------*/ +#include "stdlib.h" +#include "string.h" + +/* ----------------------- Platform includes --------------------------------*/ +#include "port.h" + +/* ----------------------- Modbus includes ----------------------------------*/ + +#include "mb.h" +#include "mbconfig.h" +#include "mbframe.h" +#include "mbproto.h" +#include "mbfunc.h" + +#include "mbport.h" +#if MB_MASTER_RTU_ENABLED == 1 +#include "mbrtu.h" +#endif +#if MB_MASTER_ASCII_ENABLED == 1 +#include "mbascii.h" +#endif +#if MB_MASTER_TCP_ENABLED == 1 +#include "mbtcp.h" +#endif + +#if MB_MASTER_RTU_ENABLED > 0 || MB_MASTER_ASCII_ENABLED > 0 + +#ifndef MB_PORT_HAS_CLOSE +#define MB_PORT_HAS_CLOSE 0 +#endif + +/* ----------------------- Static variables ---------------------------------*/ + +static UCHAR ucMBAddress; +static eMBMode eMBCurrentMode; + +static enum +{ + STATE_ENABLED, + STATE_DISABLED, + STATE_NOT_INITIALIZED +} eMBState = STATE_NOT_INITIALIZED; + +/* Functions pointer which are initialized in eMBInit( ). Depending on the + * mode (RTU or ASCII) the are set to the correct implementations. + * Using for Modbus Master,Add by Armink 20130813 + */ +static peMBFrameSend peMBMasterFrameSendCur; +static pvMBFrameStart pvMBMasterFrameStartCur; +static pvMBFrameStop pvMBMasterFrameStopCur; +static peMBFrameReceive peMBMasterFrameReceiveCur; +static pvMBFrameClose pvMBMasterFrameCloseCur; + +/* Callback functions required by the porting layer. They are called when + * an external event has happend which includes a timeout or the reception + * or transmission of a character. + * Using for Modbus Master,Add by Armink 20130813 + */ +BOOL( *pxMBMasterFrameCBByteReceived ) ( void ); +BOOL( *pxMBMasterFrameCBTransmitterEmpty ) ( void ); +BOOL( *pxMBMasterPortCBTimerExpired ) ( void ); + +BOOL( *pxMBMasterFrameCBReceiveFSMCur ) ( void ); +BOOL( *pxMBMasterFrameCBTransmitFSMCur ) ( void ); + +/* An array of Modbus functions handlers which associates Modbus function + * codes with implementing functions. + */ +static xMBFunctionHandler xFuncHandlers[MB_FUNC_HANDLERS_MAX] = { +#if MB_FUNC_OTHER_REP_SLAVEID_ENABLED > 0 + {MB_FUNC_OTHER_REPORT_SLAVEID, eMBFuncReportSlaveID}, +#endif +#if MB_FUNC_READ_INPUT_ENABLED > 0 + {MB_FUNC_READ_INPUT_REGISTER, eMBFuncReadInputRegister}, +#endif +#if MB_FUNC_READ_HOLDING_ENABLED > 0 + {MB_FUNC_READ_HOLDING_REGISTER, eMBFuncReadHoldingRegister}, +#endif +#if MB_FUNC_WRITE_MULTIPLE_HOLDING_ENABLED > 0 + {MB_FUNC_WRITE_MULTIPLE_REGISTERS, eMBFuncWriteMultipleHoldingRegister}, +#endif +#if MB_FUNC_WRITE_HOLDING_ENABLED > 0 + {MB_FUNC_WRITE_REGISTER, eMBFuncWriteHoldingRegister}, +#endif +#if MB_FUNC_READWRITE_HOLDING_ENABLED > 0 + {MB_FUNC_READWRITE_MULTIPLE_REGISTERS, eMBFuncReadWriteMultipleHoldingRegister}, +#endif +#if MB_FUNC_READ_COILS_ENABLED > 0 + {MB_FUNC_READ_COILS, eMBFuncReadCoils}, +#endif +#if MB_FUNC_WRITE_COIL_ENABLED > 0 + {MB_FUNC_WRITE_SINGLE_COIL, eMBFuncWriteCoil}, +#endif +#if MB_FUNC_WRITE_MULTIPLE_COILS_ENABLED > 0 + {MB_FUNC_WRITE_MULTIPLE_COILS, eMBFuncWriteMultipleCoils}, +#endif +#if MB_FUNC_READ_DISCRETE_INPUTS_ENABLED > 0 + {MB_FUNC_READ_DISCRETE_INPUTS, eMBFuncReadDiscreteInputs}, +#endif +}; + +/* ----------------------- Start implementation -----------------------------*/ +eMBErrorCode +eMBMasterInit( eMBMode eMode, UCHAR ucPort, ULONG ulBaudRate, eMBParity eParity ) +{ + eMBErrorCode eStatus = MB_ENOERR; + + switch (eMode) + { +#if MB_MASTER_RTU_ENABLED > 0 + case MB_RTU: + pvMBMasterFrameStartCur = eMBMasterRTUStart; + pvMBMasterFrameStopCur = eMBMasterRTUStop; + peMBMasterFrameSendCur = eMBMasterRTUSend; + peMBMasterFrameReceiveCur = eMBMasterRTUReceive; + pvMBMasterFrameCloseCur = MB_PORT_HAS_CLOSE ? vMBMasterPortClose : NULL; + pxMBMasterFrameCBByteReceived = xMBMasterRTUReceiveFSM; + pxMBMasterFrameCBTransmitterEmpty = xMBMasterRTUTransmitFSM; + pxMBMasterPortCBTimerExpired = xMBMasterRTUTimerT35Expired; + + eStatus = eMBMasterRTUInit(ucPort, ulBaudRate, eParity); + break; +#endif +#if MB_MASTER_ASCII_ENABLED > 0 + case MB_ASCII: + pvMBMasterFrameStartCur = eMBMasterASCIIStart; + pvMBMasterFrameStopCur = eMBMasterASCIIStop; + peMBMasterFrameSendCur = eMBMasterASCIISend; + peMBMasterFrameReceiveCur = eMBMasterASCIIReceive; + pvMBMasterFrameCloseCur = MB_PORT_HAS_CLOSE ? vMBMasterPortClose : NULL; + pxMBMasterFrameCBByteReceived = xMBMasterASCIIReceiveFSM; + pxMBMasterFrameCBTransmitterEmpty = xMBMasterASCIITransmitFSM; + pxMBMasterPortCBTimerExpired = xMBMasterASCIITimerT1SExpired; + + eStatus = eMBMasterASCIIInit(ucPort, ulBaudRate, eParity ); + break; +#endif + default: + eStatus = MB_EINVAL; + break; + } + + if (eStatus == MB_ENOERR) + { + if (!xMBMasterPortEventInit()) + { + /* port dependent event module initalization failed. */ + eStatus = MB_EPORTERR; + } + else + { + eMBCurrentMode = eMode; + eMBState = STATE_DISABLED; + } + } + return eStatus; +} + +eMBErrorCode +eMBMasterClose( void ) +{ + eMBErrorCode eStatus = MB_ENOERR; + + if( eMBState == STATE_DISABLED ) + { + if( pvMBMasterFrameCloseCur != NULL ) + { + pvMBMasterFrameCloseCur( ); + } + } + else + { + eStatus = MB_EILLSTATE; + } + return eStatus; +} + +eMBErrorCode +eMBMasterEnable( void ) +{ + eMBErrorCode eStatus = MB_ENOERR; + + if( eMBState == STATE_DISABLED ) + { + /* Activate the protocol stack. */ + pvMBMasterFrameStartCur( ); + eMBState = STATE_ENABLED; + } + else + { + eStatus = MB_EILLSTATE; + } + return eStatus; +} + +eMBErrorCode +eMBMasterDisable( void ) +{ + eMBErrorCode eStatus; + + if( eMBState == STATE_ENABLED ) + { + pvMBMasterFrameStopCur( ); + eMBState = STATE_DISABLED; + eStatus = MB_ENOERR; + } + else if( eMBState == STATE_DISABLED ) + { + eStatus = MB_ENOERR; + } + else + { + eStatus = MB_EILLSTATE; + } + return eStatus; +} + +eMBErrorCode eMBMasterPoll( void ) +{ + static UCHAR *ucMBFrame; + static UCHAR ucRcvAddress; + static UCHAR ucFunctionCode; + static USHORT usLength; + static eMBException eException; + + int i; + eMBErrorCode eStatus = MB_ENOERR; + eMBMasterEventType eEvent; + + /* Check if the protocol stack is ready. */ + if( eMBState != STATE_ENABLED ) + { + return MB_EILLSTATE; + } + + /* Check if there is a event available. If not return control to caller. + * Otherwise we will handle the event. */ + if( xMBMasterPortEventGet( &eEvent ) == TRUE ) + { + switch ( eEvent ) + { + case EV_MASTER_READY: + break; + + case EV_MASTER_FRAME_RECEIVED: + eStatus = peMBMasterFrameReceiveCur( &ucRcvAddress, &ucMBFrame, &usLength ); + if( eStatus == MB_ENOERR ) + { + /* Check if the frame is for us. If not ignore the frame. */ + if( ( ucRcvAddress == ucMBAddress ) || ( ucRcvAddress == MB_ADDRESS_BROADCAST ) ) + { + ( void )xMBMasterPortEventPost( EV_MASTER_EXECUTE ); + } + } + else ( void )xMBMasterPortEventPost( EV_MASTER_ERROR_PROCESS ); + break; + + case EV_MASTER_EXECUTE: + ucFunctionCode = ucMBFrame[MB_PDU_FUNC_OFF]; + eException = MB_EX_ILLEGAL_FUNCTION; + for( i = 0; i < MB_FUNC_HANDLERS_MAX; i++ ) + { + /* No more function handlers registered. Abort. */ + if( xFuncHandlers[i].ucFunctionCode == 0 ) + { + break; + } + else if( xFuncHandlers[i].ucFunctionCode == ucFunctionCode ) + { + eException = xFuncHandlers[i].pxHandler( ucMBFrame, &usLength ); + break; + } + } + + /* If the request was not sent to the broadcast address we + * return a reply. */ + if( ucRcvAddress != MB_ADDRESS_BROADCAST ) + { + if( eException != MB_EX_NONE ) + { + /* An exception occured. Build an error frame. */ + usLength = 0; + ucMBFrame[usLength++] = ( UCHAR )( ucFunctionCode | MB_FUNC_ERROR ); + ucMBFrame[usLength++] = eException; + } + eStatus = peMBMasterFrameSendCur( ucMBAddress, ucMBFrame, usLength ); + } + break; + + case EV_MASTER_FRAME_SENT: + break; + + case EV_MASTER_ERROR_PROCESS: + break; + } + } + return MB_ENOERR; +} +#endif diff --git a/FreeModbus/modbus/rtu/mbrtu.c b/FreeModbus/modbus/rtu/mbrtu.c index bdaeee4..3048286 100644 --- a/FreeModbus/modbus/rtu/mbrtu.c +++ b/FreeModbus/modbus/rtu/mbrtu.c @@ -150,7 +150,6 @@ eMBRTUStop( void ) eMBErrorCode eMBRTUReceive( UCHAR * pucRcvAddress, UCHAR ** pucFrame, USHORT * pusLength ) { - BOOL xFrameReceived = FALSE; eMBErrorCode eStatus = MB_ENOERR; ENTER_CRITICAL_SECTION( ); @@ -172,7 +171,6 @@ eMBRTUReceive( UCHAR * pucRcvAddress, UCHAR ** pucFrame, USHORT * pusLength ) /* Return the start of the Modbus PDU to the caller. */ *pucFrame = ( UCHAR * ) & ucRTUBuf[MB_SER_PDU_PDU_OFF]; - xFrameReceived = TRUE; } else { diff --git a/FreeModbus/modbus/rtu/mbrtu_m.c b/FreeModbus/modbus/rtu/mbrtu_m.c index f44937e..d76a093 100644 --- a/FreeModbus/modbus/rtu/mbrtu_m.c +++ b/FreeModbus/modbus/rtu/mbrtu_m.c @@ -151,7 +151,6 @@ eMBMasterRTUStop( void ) eMBErrorCode eMBMasterRTUReceive( UCHAR * pucRcvAddress, UCHAR ** pucFrame, USHORT * pusLength ) { - BOOL xFrameReceived = FALSE; eMBErrorCode eStatus = MB_ENOERR; ENTER_CRITICAL_SECTION( ); @@ -173,7 +172,6 @@ eMBMasterRTUReceive( UCHAR * pucRcvAddress, UCHAR ** pucFrame, USHORT * pusLengt /* Return the start of the Modbus PDU to the caller. */ *pucFrame = ( UCHAR * ) & ucMasterRTUBuf[MB_SER_PDU_PDU_OFF]; - xFrameReceived = TRUE; } else { diff --git a/FreeModbus/port/portevent_m.c b/FreeModbus/port/portevent_m.c index 26d08f6..a2cbe48 100644 --- a/FreeModbus/port/portevent_m.c +++ b/FreeModbus/port/portevent_m.c @@ -23,7 +23,7 @@ #include "mb.h" #include "mbport.h" -#if MB_MASTER_RTU_ENABLED > 0 +#if MB_MASTER_RTU_ENABLED > 0 || MB_MASTER_ASCII_ENABLED /* ----------------------- Variables ----------------------------------------*/ static eMBMasterEventType eMasterQueuedEvent; static BOOL xMasterEventInQueue; diff --git a/FreeModbus/port/portserial_m.c b/FreeModbus/port/portserial_m.c index 7ba7cab..7309397 100644 --- a/FreeModbus/port/portserial_m.c +++ b/FreeModbus/port/portserial_m.c @@ -25,7 +25,7 @@ #include "mb.h" #include "mbport.h" -#if MB_MASTER_RTU_ENABLED > 0 +#if MB_MASTER_RTU_ENABLED > 0 || MB_MASTER_ASCII_ENABLED /* ----------------------- static functions ---------------------------------*/ static void prvvUARTTxReadyISR(void); static void prvvUARTRxISR(void); diff --git a/FreeModbus/port/porttimer_m.c b/FreeModbus/port/porttimer_m.c index 9de78a4..b87ef99 100644 --- a/FreeModbus/port/porttimer_m.c +++ b/FreeModbus/port/porttimer_m.c @@ -26,7 +26,7 @@ #include "mb.h" #include "mbport.h" -#if MB_MASTER_RTU_ENABLED > 0 +#if MB_MASTER_RTU_ENABLED > 0 || MB_MASTER_ASCII_ENABLED /* ----------------------- Variables ----------------------------------------*/ static USHORT usT35TimeOut50us; diff --git a/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvopt b/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvopt index 6424a84..f03fe01 100644 --- a/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvopt +++ b/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvopt @@ -476,35 +476,35 @@ 1 - 5 + 4 1 0 0 - 61 + 0 0 - 1 - 25 + 0 + 0 0 ..\APP\src\cpuusage.c cpuusage.c 1 - 6 + 5 5 0 0 - 51 + 0 0 - 6 - 30 + 0 + 0 0 ..\APP\inc\delay_conf.h delay_conf.h 1 - 7 + 6 5 0 0 @@ -518,14 +518,14 @@ 1 - 8 + 7 5 0 0 - 35 + 0 0 - 1 - 15 + 0 + 0 0 ..\APP\inc\rtconfig.h rtconfig.h @@ -539,21 +539,21 @@ 0 2 - 9 + 8 1 0 0 - 12 + 0 0 - 185 - 193 + 0 + 0 0 ..\BSP\src\bsp.c bsp.c 2 - 10 + 9 1 0 0 @@ -567,7 +567,7 @@ 2 - 11 + 10 1 0 0 @@ -581,7 +581,7 @@ 2 - 12 + 11 1 0 0 @@ -595,7 +595,7 @@ 2 - 13 + 12 2 0 0 @@ -616,7 +616,7 @@ 0 3 - 14 + 13 1 0 0 @@ -630,7 +630,7 @@ 3 - 15 + 14 1 0 0 @@ -644,7 +644,7 @@ 3 - 16 + 15 1 0 0 @@ -658,7 +658,7 @@ 3 - 17 + 16 1 0 0 @@ -672,7 +672,7 @@ 3 - 18 + 17 1 0 0 @@ -686,7 +686,7 @@ 3 - 19 + 18 1 0 0 @@ -700,7 +700,7 @@ 3 - 20 + 19 1 0 0 @@ -714,7 +714,7 @@ 3 - 21 + 20 1 0 0 @@ -728,7 +728,7 @@ 3 - 22 + 21 1 0 0 @@ -742,7 +742,7 @@ 3 - 23 + 22 1 0 0 @@ -756,7 +756,7 @@ 3 - 24 + 23 1 0 0 @@ -770,7 +770,7 @@ 3 - 25 + 24 1 0 0 @@ -784,7 +784,7 @@ 3 - 26 + 25 1 0 0 @@ -798,7 +798,7 @@ 3 - 27 + 26 1 0 0 @@ -812,7 +812,7 @@ 3 - 28 + 27 1 0 0 @@ -826,7 +826,7 @@ 3 - 29 + 28 1 0 0 @@ -840,7 +840,7 @@ 3 - 30 + 29 1 0 0 @@ -854,7 +854,7 @@ 3 - 31 + 30 1 0 0 @@ -868,7 +868,7 @@ 3 - 32 + 31 1 0 0 @@ -882,7 +882,7 @@ 3 - 33 + 32 1 0 0 @@ -896,11 +896,11 @@ 3 - 34 + 33 1 0 0 - 1 + 0 0 0 0 @@ -910,7 +910,7 @@ 3 - 35 + 34 1 0 0 @@ -924,7 +924,7 @@ 3 - 36 + 35 2 0 0 @@ -945,7 +945,7 @@ 0 4 - 37 + 36 1 0 0 @@ -959,7 +959,7 @@ 4 - 38 + 37 1 0 0 @@ -980,7 +980,7 @@ 0 5 - 39 + 38 1 0 0 @@ -994,7 +994,7 @@ 5 - 40 + 39 1 0 0 @@ -1008,7 +1008,7 @@ 5 - 41 + 40 1 0 0 @@ -1022,7 +1022,7 @@ 5 - 42 + 41 1 0 0 @@ -1036,11 +1036,11 @@ 5 - 43 + 42 1 0 0 - 15 + 0 0 0 0 @@ -1050,7 +1050,7 @@ 5 - 44 + 43 1 0 0 @@ -1064,7 +1064,7 @@ 5 - 45 + 44 1 0 0 @@ -1078,7 +1078,7 @@ 5 - 46 + 45 1 0 0 @@ -1092,7 +1092,7 @@ 5 - 47 + 46 1 0 0 @@ -1106,7 +1106,7 @@ 5 - 48 + 47 1 0 0 @@ -1120,7 +1120,7 @@ 5 - 49 + 48 1 0 0 @@ -1134,7 +1134,7 @@ 5 - 50 + 49 1 0 0 @@ -1148,7 +1148,7 @@ 5 - 51 + 50 1 0 0 @@ -1162,7 +1162,7 @@ 5 - 52 + 51 1 0 0 @@ -1176,7 +1176,7 @@ 5 - 53 + 52 1 0 0 @@ -1191,27 +1191,27 @@ - FreeModbus + FreeModbusSlave 0 0 0 6 - 54 + 53 1 0 0 - 45 + 0 0 - 251 - 261 + 0 + 0 0 ..\FreeModbus\modbus\mb.c mb.c 6 - 55 + 54 1 0 0 @@ -1225,11 +1225,11 @@ 6 - 56 + 55 1 0 0 - 71 + 0 0 0 0 @@ -1239,7 +1239,7 @@ 6 - 57 + 56 1 0 0 @@ -1253,7 +1253,7 @@ 6 - 58 + 57 1 0 0 @@ -1267,7 +1267,7 @@ 6 - 59 + 58 1 0 0 @@ -1281,7 +1281,7 @@ 6 - 60 + 59 1 0 0 @@ -1295,7 +1295,7 @@ 6 - 61 + 60 1 0 0 @@ -1309,7 +1309,7 @@ 6 - 62 + 61 1 0 0 @@ -1323,21 +1323,7 @@ 6 - 63 - 1 - 0 - 0 - 0 - 0 - 126 - 126 - 0 - ..\FreeModbus\modbus\rtu\mbrtu.c - mbrtu.c - - - 6 - 0 + 62 1 0 0 @@ -1346,8 +1332,8 @@ 0 0 0 - ..\FreeModbus\modbus\rtu\mbrtu_m.c - mbrtu_m.c + ..\FreeModbus\modbus\rtu\mbrtu.c + mbrtu.c 6 @@ -1407,6 +1393,55 @@ 6 + 71 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\FreeModbus\port\user_app_s.c + user_app_s.c + + + + + FreeModbusMaster + 0 + 0 + 0 + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\FreeModbus\modbus\mb_m.c + mb_m.c + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + ..\FreeModbus\modbus\rtu\mbrtu_m.c + mbrtu_m.c + + + 0 0 1 0 @@ -1420,21 +1455,21 @@ portevent_m.c - 6 + 0 0 1 0 0 - 34 + 0 0 - 141 - 154 + 0 + 0 0 ..\FreeModbus\port\portserial_m.c portserial_m.c - 6 + 0 0 1 0 @@ -1447,20 +1482,6 @@ ..\FreeModbus\port\porttimer_m.c porttimer_m.c - - 6 - 0 - 1 - 0 - 0 - 42 - 0 - 67 - 67 - 0 - ..\FreeModbus\port\user_app_s.c - user_app_s.c - @@ -1470,8 +1491,8 @@ 2 3 - -32000 - -32000 + -1 + -1 -1 @@ -1511,7 +1532,7 @@ 16 - 6C0100001C010000DE040000A7010000 + EF0000009F000000610400002A010000 @@ -2936,7 +2957,7 @@ 2569 - 000000000D000000000000000040000000000000FFFFFFFFFFFFFFFFD60300004F000000DA030000680200000000000002000000040000000100000000000000000000000000000000000000000000000100000077940000000000000000000000000000000000000000000001000000779400000100000077940000000000000020000000000000FFFFFFFFFFFFFFFFB5000000DA00000027040000DE000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000000000006C0100001C010000DE040000A7010000B50000004F00000027040000DA0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF270400004F0000002B040000A8020000000000000200000004000000010000000000000000000000FFFFFFFF16000000E20500002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000E20400001C01000093050000750300002B0400004F000000DC040000A80200000000000040410046160000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFE20000004F000000E60000000003000001000000020000100400000001000000E1FEFFFF0E020000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000B70000001C01000099010000CD030000000000004F000000E2000000000300000000000040140056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000005020000DC0400000902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0900000098070000E30500008F0700009007000091070000B9050000BA050000BB050000BC05000001800080000000000000B7000000D602000093050000750300000000000009020000DC040000A80200000000000040820046090000000A43616C6C20537461636B000000009807000001000000FFFFFFFFFFFFFFFF0A43616C6C20537461636B00000000E305000001000000FFFFFFFFFFFFFFFF064C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF6E0200000902000072020000A802000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF9807000001000000FFFFFFFF9807000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000000300009006000004030000010000000100001004000000010000005DFEFFFF36010000FFFFFFFF06000000C5000000C70000009307000094070000950700009607000001800080000001000000B7000000D10300004707000096040000000000000403000090060000C90300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000D000000000000000040000000000000FFFFFFFFFFFFFFFFD60300004F000000DA030000680200000000000002000000040000000100000000000000000000000000000000000000000000000100000077940000000000000000000000000000000000000000000001000000779400000100000077940000000000000020000000000000FFFFFFFFFFFFFFFFB5000000DA00000027040000DE000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000EF0000009F000000610400002A010000B50000004F00000027040000DA0000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF270400004F0000002B040000A8020000000000000200000004000000010000000000000000000000FFFFFFFF16000000E20500002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000001800040000000000000650400009F00000016050000F80200002B0400004F000000DC040000A80200000000000040410046160000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFE20000004F000000E60000000003000001000000020000100400000001000000E1FEFFFF0E020000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000003A0000009F0000001C01000050030000000000004F000000E2000000000300000000000040140056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000005020000DC0400000902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0900000098070000E30500008F0700009007000091070000B9050000BA050000BB050000BC050000018000800000000000003A0000005902000016050000F80200000000000009020000DC040000A80200000000000040820046090000000A43616C6C20537461636B000000009807000001000000FFFFFFFFFFFFFFFF0A43616C6C20537461636B00000000E305000001000000FFFFFFFFFFFFFFFF064C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF6E0200000902000072020000A802000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF9807000001000000FFFFFFFF9807000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000000300009006000004030000010000000100001004000000010000005DFEFFFF36010000FFFFFFFF06000000C5000000C700000093070000940700009507000096070000018000800000010000003A00000054030000CA06000019040000000000000403000090060000C90300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -2975,7 +2996,7 @@ Debug 2582 - 00200000000000001B00FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380DB8B00000000000031000000064C6F63616C73000000000000000000000000010000000100000000000000000000000100000000001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138046010000000000004900000013446562756720526573746F72652056696577730000000000000000000000000100000001000000000000000000000001000000030013802C8C000000000000FFFFFFFF1A446562756720526573746F726520566965777320416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013802B8C000000000000FFFFFFFF17265265736574205669657720746F2044656661756C7473010000000000000001000000000000000100000000000000000000000100000000000000000005446562756791020000 + 00200000000000001B00FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380DB8B00000000000031000000064C6F63616C73000000000000000000000000010000000100000000000000000000000100000000001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138046010000000000004900000013446562756720526573746F72652056696577730000000000000000000000000100000001000000000000000000000001000000030013802C8C000000000000FFFFFFFF1A446562756720526573746F726520566965777320416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013802B8C000000000000FFFFFFFF17265265736574205669657720746F2044656661756C7473000000000000000001000000000000000100000000000000000000000100000000000000000005446562756791020000 968 diff --git a/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvproj b/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvproj index c77dfcd..e6fbaf4 100644 --- a/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvproj +++ b/RVMDK/FreeModbus_Slave&Master+RTT+STM32.uvproj @@ -668,7 +668,7 @@ - FreeModbus + FreeModbusSlave mb.c @@ -720,11 +720,6 @@ 1 ..\FreeModbus\modbus\rtu\mbrtu.c - - mbrtu_m.c - 1 - ..\FreeModbus\modbus\rtu\mbrtu_m.c - port.c 1 @@ -745,6 +740,26 @@ 1 ..\FreeModbus\port\porttimer.c + + user_app_s.c + 1 + ..\FreeModbus\port\user_app_s.c + + + + + FreeModbusMaster + + + mb_m.c + 1 + ..\FreeModbus\modbus\mb_m.c + + + mbrtu_m.c + 1 + ..\FreeModbus\modbus\rtu\mbrtu_m.c + portevent_m.c 1 @@ -760,11 +775,6 @@ 1 ..\FreeModbus\port\porttimer_m.c - - user_app_s.c - 1 - ..\FreeModbus\port\user_app_s.c - @@ -1431,7 +1441,7 @@ - FreeModbus + FreeModbusSlave mb.c @@ -1483,11 +1493,6 @@ 1 ..\FreeModbus\modbus\rtu\mbrtu.c - - mbrtu_m.c - 1 - ..\FreeModbus\modbus\rtu\mbrtu_m.c - port.c 1 @@ -1508,6 +1513,26 @@ 1 ..\FreeModbus\port\porttimer.c + + user_app_s.c + 1 + ..\FreeModbus\port\user_app_s.c + + + + + FreeModbusMaster + + + mb_m.c + 1 + ..\FreeModbus\modbus\mb_m.c + + + mbrtu_m.c + 1 + ..\FreeModbus\modbus\rtu\mbrtu_m.c + portevent_m.c 1 @@ -1523,11 +1548,6 @@ 1 ..\FreeModbus\port\porttimer_m.c - - user_app_s.c - 1 - ..\FreeModbus\port\user_app_s.c -