>> ADS1256ReadData
-analog_ctrl (Thumb, 452 bytes, Stack size 8 bytes, provalctrl.o(i.analog_ctrl))
+
analog_ctrl (Thumb, 450 bytes, Stack size 8 bytes, provalctrl.o(i.analog_ctrl))
[Stack]
- Max Depth = 48
- Call Chain = analog_ctrl ⇒ ao_dwq_set ⇒ ao_write
[Calls]- >> ao_dwq_set
@@ -2138,7 +2138,7 @@ Global Symbols
- >> wf5803_ReadReg
-tim6_cnt (Thumb, 308 bytes, Stack size 0 bytes, timer.o(i.tim6_cnt))
+
tim6_cnt (Thumb, 338 bytes, Stack size 0 bytes, timer.o(i.tim6_cnt))
[Called By]
- >> HAL_TIM_PeriodElapsedCallback
diff --git a/MDK-ARM/VOQC/VOQC.map b/MDK-ARM/VOQC/VOQC.map
index f92bb8d..8467835 100644
--- a/MDK-ARM/VOQC/VOQC.map
+++ b/MDK-ARM/VOQC/VOQC.map
@@ -1547,7 +1547,7 @@ Section Cross References
provalctrl.o(i.analog_ctrl) refers to modbus.o(.data) for HoldReg
provalctrl.o(i.analog_ctrl) refers to provalctrl.o(.data) for ao_dwq
provalctrl.o(i.analog_ctrl) refers to provalctrl.o(.bss) for pv_one
- provalctrl.o(i.analog_ctrl) refers to timer.o(.data) for it_100ms_flag_pv
+ provalctrl.o(i.analog_ctrl) refers to timer.o(.data) for it_50ms_flag_pv
provalctrl.o(i.analog_ctrl) refers to modbus.o(.bss) for InputReg
provalctrl.o(i.prov_init) refers to provalctrl.o(.bss) for pv_one
provalctrl.o(i.prov_init) refers to dac7311.o(i.ao_blf1_set) for ao_blf1_set
@@ -2543,7 +2543,7 @@ Removing Unused input sections from the image.
Removing ch395.o(i.ch395_write_cmd), (52 bytes).
Removing ch395.o(i.ch395_write_data), (12 bytes).
Removing ch395.o(i.ch395q_handler), (36 bytes).
- Removing ch395.o(i.ch395q_socket_config), (528 bytes).
+ Removing ch395.o(i.ch395q_socket_config), (532 bytes).
Removing ch395.o(i.spi2_read_write_byte), (32 bytes).
Removing ch395.o(.bss), (2212 bytes).
Removing ch395.o(.data), (44 bytes).
@@ -2627,7 +2627,7 @@ Removing Unused input sections from the image.
Removing encoder.o(.revsh_text), (4 bytes).
Removing encoder.o(.rrx_text), (6 bytes).
-762 unused section(s) (total 81110 bytes) removed from the image.
+762 unused section(s) (total 81114 bytes) removed from the image.
==============================================================================
@@ -3136,51 +3136,51 @@ Image Symbol Table
i.modbus_process_rtu 0x08005df0 Section 0 modbus_rtu.o(i.modbus_process_rtu)
i.modbus_rtu_init 0x08005e34 Section 0 modbus_rtu.o(i.modbus_rtu_init)
i.modbus_rx_cb 0x08005e88 Section 0 modbus_rtu.o(i.modbus_rx_cb)
- i.prov_calibrate_step 0x08005f08 Section 0 provalctrl.o(i.prov_calibrate_step)
- i.prov_ctrl 0x0800603c Section 0 provalctrl.o(i.prov_ctrl)
- i.prov_init 0x080060fc Section 0 provalctrl.o(i.prov_init)
- i.readcoilstate_rtu 0x08006204 Section 0 modbus_rtu.o(i.readcoilstate_rtu)
- i.readdisinputstate_rtu 0x08006354 Section 0 modbus_rtu.o(i.readdisinputstate_rtu)
- i.readholdreg_rtu 0x080064a0 Section 0 modbus_rtu.o(i.readholdreg_rtu)
- i.readinputreg_rtu 0x080065ac Section 0 modbus_rtu.o(i.readinputreg_rtu)
- i.setcs 0x080066b0 Section 0 ms5803.o(i.setcs)
- i.tim6_cnt 0x08006718 Section 0 timer.o(i.tim6_cnt)
- i.uart_send 0x0800689c Section 0 uarts.o(i.uart_send)
- i.wf5803_ReadReg 0x080068b0 Section 0 mf5803.o(i.wf5803_ReadReg)
- i.wf5803_WriteReg 0x080068d2 Section 0 mf5803.o(i.wf5803_WriteReg)
- i.writemulticoil_rtu 0x080068f4 Section 0 modbus_rtu.o(i.writemulticoil_rtu)
- i.writemultireg_rtu 0x08006a40 Section 0 modbus_rtu.o(i.writemultireg_rtu)
- i.writesinglecoil_rtu 0x08006b44 Section 0 modbus_rtu.o(i.writesinglecoil_rtu)
- i.writesinglereg_rtu 0x08006c08 Section 0 modbus_rtu.o(i.writesinglereg_rtu)
- x$fpl$dadd 0x08006cc0 Section 336 daddsub_clz.o(x$fpl$dadd)
- $v0 0x08006cc0 Number 0 daddsub_clz.o(x$fpl$dadd)
- _dadd1 0x08006cd1 Thumb Code 0 daddsub_clz.o(x$fpl$dadd)
- x$fpl$ddiv 0x08006e10 Section 688 ddiv.o(x$fpl$ddiv)
- $v0 0x08006e10 Number 0 ddiv.o(x$fpl$ddiv)
- ddiv_entry 0x08006e17 Thumb Code 0 ddiv.o(x$fpl$ddiv)
- x$fpl$dfix 0x080070c0 Section 94 dfix.o(x$fpl$dfix)
- $v0 0x080070c0 Number 0 dfix.o(x$fpl$dfix)
- x$fpl$dfixu 0x08007120 Section 90 dfixu.o(x$fpl$dfixu)
- $v0 0x08007120 Number 0 dfixu.o(x$fpl$dfixu)
- x$fpl$dflt 0x0800717a Section 46 dflt_clz.o(x$fpl$dflt)
- $v0 0x0800717a Number 0 dflt_clz.o(x$fpl$dflt)
- x$fpl$dfltll 0x080071a8 Section 162 dfltll_clz.o(x$fpl$dfltll)
- $v0 0x080071a8 Number 0 dfltll_clz.o(x$fpl$dfltll)
- x$fpl$dmul 0x0800724c Section 340 dmul.o(x$fpl$dmul)
- $v0 0x0800724c Number 0 dmul.o(x$fpl$dmul)
- x$fpl$dnaninf 0x080073a0 Section 156 dnaninf.o(x$fpl$dnaninf)
- $v0 0x080073a0 Number 0 dnaninf.o(x$fpl$dnaninf)
- x$fpl$dretinf 0x0800743c Section 12 dretinf.o(x$fpl$dretinf)
- $v0 0x0800743c Number 0 dretinf.o(x$fpl$dretinf)
- x$fpl$dsub 0x08007448 Section 468 daddsub_clz.o(x$fpl$dsub)
- $v0 0x08007448 Number 0 daddsub_clz.o(x$fpl$dsub)
- _dsub1 0x08007459 Thumb Code 0 daddsub_clz.o(x$fpl$dsub)
- x$fpl$fpinit 0x0800761c Section 10 fpinit.o(x$fpl$fpinit)
- $v0 0x0800761c Number 0 fpinit.o(x$fpl$fpinit)
- .constdata 0x08007626 Section 8 stm32f4xx_hal_dma.o(.constdata)
- x$fpl$usenofp 0x08007626 Section 0 usenofp.o(x$fpl$usenofp)
- flagBitshiftOffset 0x08007626 Data 8 stm32f4xx_hal_dma.o(.constdata)
- .constdata 0x0800762e Section 24 system_stm32f4xx.o(.constdata)
+ i.prov_calibrate_step 0x08005f0c Section 0 provalctrl.o(i.prov_calibrate_step)
+ i.prov_ctrl 0x08006040 Section 0 provalctrl.o(i.prov_ctrl)
+ i.prov_init 0x08006104 Section 0 provalctrl.o(i.prov_init)
+ i.readcoilstate_rtu 0x08006210 Section 0 modbus_rtu.o(i.readcoilstate_rtu)
+ i.readdisinputstate_rtu 0x08006360 Section 0 modbus_rtu.o(i.readdisinputstate_rtu)
+ i.readholdreg_rtu 0x080064ac Section 0 modbus_rtu.o(i.readholdreg_rtu)
+ i.readinputreg_rtu 0x080065b8 Section 0 modbus_rtu.o(i.readinputreg_rtu)
+ i.setcs 0x080066bc Section 0 ms5803.o(i.setcs)
+ i.tim6_cnt 0x08006724 Section 0 timer.o(i.tim6_cnt)
+ i.uart_send 0x080068d0 Section 0 uarts.o(i.uart_send)
+ i.wf5803_ReadReg 0x080068e4 Section 0 mf5803.o(i.wf5803_ReadReg)
+ i.wf5803_WriteReg 0x08006906 Section 0 mf5803.o(i.wf5803_WriteReg)
+ i.writemulticoil_rtu 0x08006928 Section 0 modbus_rtu.o(i.writemulticoil_rtu)
+ i.writemultireg_rtu 0x08006a74 Section 0 modbus_rtu.o(i.writemultireg_rtu)
+ i.writesinglecoil_rtu 0x08006b78 Section 0 modbus_rtu.o(i.writesinglecoil_rtu)
+ i.writesinglereg_rtu 0x08006c3c Section 0 modbus_rtu.o(i.writesinglereg_rtu)
+ x$fpl$dadd 0x08006cf4 Section 336 daddsub_clz.o(x$fpl$dadd)
+ $v0 0x08006cf4 Number 0 daddsub_clz.o(x$fpl$dadd)
+ _dadd1 0x08006d05 Thumb Code 0 daddsub_clz.o(x$fpl$dadd)
+ x$fpl$ddiv 0x08006e44 Section 688 ddiv.o(x$fpl$ddiv)
+ $v0 0x08006e44 Number 0 ddiv.o(x$fpl$ddiv)
+ ddiv_entry 0x08006e4b Thumb Code 0 ddiv.o(x$fpl$ddiv)
+ x$fpl$dfix 0x080070f4 Section 94 dfix.o(x$fpl$dfix)
+ $v0 0x080070f4 Number 0 dfix.o(x$fpl$dfix)
+ x$fpl$dfixu 0x08007154 Section 90 dfixu.o(x$fpl$dfixu)
+ $v0 0x08007154 Number 0 dfixu.o(x$fpl$dfixu)
+ x$fpl$dflt 0x080071ae Section 46 dflt_clz.o(x$fpl$dflt)
+ $v0 0x080071ae Number 0 dflt_clz.o(x$fpl$dflt)
+ x$fpl$dfltll 0x080071dc Section 162 dfltll_clz.o(x$fpl$dfltll)
+ $v0 0x080071dc Number 0 dfltll_clz.o(x$fpl$dfltll)
+ x$fpl$dmul 0x08007280 Section 340 dmul.o(x$fpl$dmul)
+ $v0 0x08007280 Number 0 dmul.o(x$fpl$dmul)
+ x$fpl$dnaninf 0x080073d4 Section 156 dnaninf.o(x$fpl$dnaninf)
+ $v0 0x080073d4 Number 0 dnaninf.o(x$fpl$dnaninf)
+ x$fpl$dretinf 0x08007470 Section 12 dretinf.o(x$fpl$dretinf)
+ $v0 0x08007470 Number 0 dretinf.o(x$fpl$dretinf)
+ x$fpl$dsub 0x0800747c Section 468 daddsub_clz.o(x$fpl$dsub)
+ $v0 0x0800747c Number 0 daddsub_clz.o(x$fpl$dsub)
+ _dsub1 0x0800748d Thumb Code 0 daddsub_clz.o(x$fpl$dsub)
+ x$fpl$fpinit 0x08007650 Section 10 fpinit.o(x$fpl$fpinit)
+ $v0 0x08007650 Number 0 fpinit.o(x$fpl$fpinit)
+ .constdata 0x0800765a Section 8 stm32f4xx_hal_dma.o(.constdata)
+ x$fpl$usenofp 0x0800765a Section 0 usenofp.o(x$fpl$usenofp)
+ flagBitshiftOffset 0x0800765a Data 8 stm32f4xx_hal_dma.o(.constdata)
+ .constdata 0x08007662 Section 24 system_stm32f4xx.o(.constdata)
.data 0x20000000 Section 9 stm32f4xx_hal.o(.data)
.data 0x2000000c Section 4 system_stm32f4xx.o(.data)
.data 0x20000010 Section 24 ads1256.o(.data)
@@ -3191,27 +3191,27 @@ Image Symbol Table
.data 0x2000007a Section 110 modbus.o(.data)
.data 0x200000e8 Section 6 adcs.o(.data)
.data 0x200000ee Section 2 gpios.o(.data)
- .data 0x200000f0 Section 81 timer.o(.data)
- .data 0x20000144 Section 8 uarts.o(.data)
- .data 0x2000014c Section 16 provalctrl.o(.data)
- .data 0x2000015c Section 16 encoder.o(.data)
- .bss 0x2000016c Section 168 adc.o(.bss)
- .bss 0x20000214 Section 84 i2c.o(.bss)
- .bss 0x20000268 Section 88 spi.o(.bss)
- .bss 0x200002c0 Section 216 tim.o(.bss)
- .bss 0x20000398 Section 840 usart.o(.bss)
- .bss 0x200006e0 Section 176 ads1220.o(.bss)
- .bss 0x20000790 Section 480 mf5803.o(.bss)
- .bss 0x20000970 Section 196 modbus.o(.bss)
- .bss 0x20000a34 Section 2048 modbus_rtu.o(.bss)
- .bss 0x20001234 Section 276 uarts.o(.bss)
- .bss 0x20001348 Section 112 provalctrl.o(.bss)
- .bss 0x200013b8 Section 96 libspace.o(.bss)
- HEAP 0x20001418 Section 512 startup_stm32f407xx.o(HEAP)
- Heap_Mem 0x20001418 Data 512 startup_stm32f407xx.o(HEAP)
- STACK 0x20001618 Section 1024 startup_stm32f407xx.o(STACK)
- Stack_Mem 0x20001618 Data 1024 startup_stm32f407xx.o(STACK)
- __initial_sp 0x20001a18 Data 0 startup_stm32f407xx.o(STACK)
+ .data 0x200000f0 Section 89 timer.o(.data)
+ .data 0x2000014c Section 8 uarts.o(.data)
+ .data 0x20000154 Section 16 provalctrl.o(.data)
+ .data 0x20000164 Section 16 encoder.o(.data)
+ .bss 0x20000174 Section 168 adc.o(.bss)
+ .bss 0x2000021c Section 84 i2c.o(.bss)
+ .bss 0x20000270 Section 88 spi.o(.bss)
+ .bss 0x200002c8 Section 216 tim.o(.bss)
+ .bss 0x200003a0 Section 840 usart.o(.bss)
+ .bss 0x200006e8 Section 176 ads1220.o(.bss)
+ .bss 0x20000798 Section 240 mf5803.o(.bss)
+ .bss 0x20000888 Section 196 modbus.o(.bss)
+ .bss 0x2000094c Section 2048 modbus_rtu.o(.bss)
+ .bss 0x2000114c Section 276 uarts.o(.bss)
+ .bss 0x20001260 Section 112 provalctrl.o(.bss)
+ .bss 0x200012d0 Section 96 libspace.o(.bss)
+ HEAP 0x20001330 Section 512 startup_stm32f407xx.o(HEAP)
+ Heap_Mem 0x20001330 Data 512 startup_stm32f407xx.o(HEAP)
+ STACK 0x20001530 Section 1024 startup_stm32f407xx.o(STACK)
+ Stack_Mem 0x20001530 Data 1024 startup_stm32f407xx.o(STACK)
+ __initial_sp 0x20001930 Data 0 startup_stm32f407xx.o(STACK)
Global Symbols
@@ -3541,7 +3541,7 @@ Image Symbol Table
ads1256_init 0x08004dd5 Thumb Code 74 ads1256.o(i.ads1256_init)
ads1256_read_byte 0x08004e25 Thumb Code 78 ads1256.o(i.ads1256_read_byte)
ads1256_write_byte 0x08004e7d Thumb Code 108 ads1256.o(i.ads1256_write_byte)
- analog_ctrl 0x08004ef1 Thumb Code 452 provalctrl.o(i.analog_ctrl)
+ analog_ctrl 0x08004ef1 Thumb Code 450 provalctrl.o(i.analog_ctrl)
analog_gather 0x080050ed Thumb Code 64 adcs.o(i.analog_gather)
ao_blf1_set 0x0800513d Thumb Code 64 dac7311.o(i.ao_blf1_set)
ao_blf2_set 0x08005189 Thumb Code 64 dac7311.o(i.ao_blf2_set)
@@ -3574,48 +3574,48 @@ Image Symbol Table
modbus_process_rtu 0x08005df1 Thumb Code 64 modbus_rtu.o(i.modbus_process_rtu)
modbus_rtu_init 0x08005e35 Thumb Code 58 modbus_rtu.o(i.modbus_rtu_init)
modbus_rx_cb 0x08005e89 Thumb Code 98 modbus_rtu.o(i.modbus_rx_cb)
- prov_calibrate_step 0x08005f09 Thumb Code 306 provalctrl.o(i.prov_calibrate_step)
- prov_ctrl 0x0800603d Thumb Code 180 provalctrl.o(i.prov_ctrl)
- prov_init 0x080060fd Thumb Code 240 provalctrl.o(i.prov_init)
- readcoilstate_rtu 0x08006205 Thumb Code 326 modbus_rtu.o(i.readcoilstate_rtu)
- readdisinputstate_rtu 0x08006355 Thumb Code 322 modbus_rtu.o(i.readdisinputstate_rtu)
- readholdreg_rtu 0x080064a1 Thumb Code 258 modbus_rtu.o(i.readholdreg_rtu)
- readinputreg_rtu 0x080065ad Thumb Code 252 modbus_rtu.o(i.readinputreg_rtu)
- setcs 0x080066b1 Thumb Code 86 ms5803.o(i.setcs)
- tim6_cnt 0x08006719 Thumb Code 308 timer.o(i.tim6_cnt)
- uart_send 0x0800689d Thumb Code 20 uarts.o(i.uart_send)
- wf5803_ReadReg 0x080068b1 Thumb Code 34 mf5803.o(i.wf5803_ReadReg)
- wf5803_WriteReg 0x080068d3 Thumb Code 34 mf5803.o(i.wf5803_WriteReg)
- writemulticoil_rtu 0x080068f5 Thumb Code 322 modbus_rtu.o(i.writemulticoil_rtu)
- writemultireg_rtu 0x08006a41 Thumb Code 252 modbus_rtu.o(i.writemultireg_rtu)
- writesinglecoil_rtu 0x08006b45 Thumb Code 188 modbus_rtu.o(i.writesinglecoil_rtu)
- writesinglereg_rtu 0x08006c09 Thumb Code 176 modbus_rtu.o(i.writesinglereg_rtu)
- __aeabi_dadd 0x08006cc1 Thumb Code 0 daddsub_clz.o(x$fpl$dadd)
- _dadd 0x08006cc1 Thumb Code 332 daddsub_clz.o(x$fpl$dadd)
- __aeabi_ddiv 0x08006e11 Thumb Code 0 ddiv.o(x$fpl$ddiv)
- _ddiv 0x08006e11 Thumb Code 552 ddiv.o(x$fpl$ddiv)
- __aeabi_d2iz 0x080070c1 Thumb Code 0 dfix.o(x$fpl$dfix)
- _dfix 0x080070c1 Thumb Code 94 dfix.o(x$fpl$dfix)
- __aeabi_d2uiz 0x08007121 Thumb Code 0 dfixu.o(x$fpl$dfixu)
- _dfixu 0x08007121 Thumb Code 90 dfixu.o(x$fpl$dfixu)
- __aeabi_i2d 0x0800717b Thumb Code 0 dflt_clz.o(x$fpl$dflt)
- _dflt 0x0800717b Thumb Code 46 dflt_clz.o(x$fpl$dflt)
- __aeabi_l2d 0x080071a9 Thumb Code 0 dfltll_clz.o(x$fpl$dfltll)
- _ll_sto_d 0x080071a9 Thumb Code 162 dfltll_clz.o(x$fpl$dfltll)
- __aeabi_dmul 0x0800724d Thumb Code 0 dmul.o(x$fpl$dmul)
- _dmul 0x0800724d Thumb Code 332 dmul.o(x$fpl$dmul)
- __fpl_dnaninf 0x080073a1 Thumb Code 156 dnaninf.o(x$fpl$dnaninf)
- __fpl_dretinf 0x0800743d Thumb Code 12 dretinf.o(x$fpl$dretinf)
- __aeabi_dsub 0x08007449 Thumb Code 0 daddsub_clz.o(x$fpl$dsub)
- _dsub 0x08007449 Thumb Code 464 daddsub_clz.o(x$fpl$dsub)
- _fp_init 0x0800761d Thumb Code 10 fpinit.o(x$fpl$fpinit)
- __fplib_config_fpu_vfp 0x08007625 Thumb Code 0 fpinit.o(x$fpl$fpinit)
- __fplib_config_pureend_doubles 0x08007625 Thumb Code 0 fpinit.o(x$fpl$fpinit)
- __I$use$fp 0x08007626 Number 0 usenofp.o(x$fpl$usenofp)
- AHBPrescTable 0x0800762e Data 16 system_stm32f4xx.o(.constdata)
- APBPrescTable 0x0800763e Data 8 system_stm32f4xx.o(.constdata)
- Region$$Table$$Base 0x08007648 Number 0 anon$$obj.o(Region$$Table)
- Region$$Table$$Limit 0x08007668 Number 0 anon$$obj.o(Region$$Table)
+ prov_calibrate_step 0x08005f0d Thumb Code 306 provalctrl.o(i.prov_calibrate_step)
+ prov_ctrl 0x08006041 Thumb Code 180 provalctrl.o(i.prov_ctrl)
+ prov_init 0x08006105 Thumb Code 240 provalctrl.o(i.prov_init)
+ readcoilstate_rtu 0x08006211 Thumb Code 326 modbus_rtu.o(i.readcoilstate_rtu)
+ readdisinputstate_rtu 0x08006361 Thumb Code 322 modbus_rtu.o(i.readdisinputstate_rtu)
+ readholdreg_rtu 0x080064ad Thumb Code 258 modbus_rtu.o(i.readholdreg_rtu)
+ readinputreg_rtu 0x080065b9 Thumb Code 252 modbus_rtu.o(i.readinputreg_rtu)
+ setcs 0x080066bd Thumb Code 86 ms5803.o(i.setcs)
+ tim6_cnt 0x08006725 Thumb Code 338 timer.o(i.tim6_cnt)
+ uart_send 0x080068d1 Thumb Code 20 uarts.o(i.uart_send)
+ wf5803_ReadReg 0x080068e5 Thumb Code 34 mf5803.o(i.wf5803_ReadReg)
+ wf5803_WriteReg 0x08006907 Thumb Code 34 mf5803.o(i.wf5803_WriteReg)
+ writemulticoil_rtu 0x08006929 Thumb Code 322 modbus_rtu.o(i.writemulticoil_rtu)
+ writemultireg_rtu 0x08006a75 Thumb Code 252 modbus_rtu.o(i.writemultireg_rtu)
+ writesinglecoil_rtu 0x08006b79 Thumb Code 188 modbus_rtu.o(i.writesinglecoil_rtu)
+ writesinglereg_rtu 0x08006c3d Thumb Code 176 modbus_rtu.o(i.writesinglereg_rtu)
+ __aeabi_dadd 0x08006cf5 Thumb Code 0 daddsub_clz.o(x$fpl$dadd)
+ _dadd 0x08006cf5 Thumb Code 332 daddsub_clz.o(x$fpl$dadd)
+ __aeabi_ddiv 0x08006e45 Thumb Code 0 ddiv.o(x$fpl$ddiv)
+ _ddiv 0x08006e45 Thumb Code 552 ddiv.o(x$fpl$ddiv)
+ __aeabi_d2iz 0x080070f5 Thumb Code 0 dfix.o(x$fpl$dfix)
+ _dfix 0x080070f5 Thumb Code 94 dfix.o(x$fpl$dfix)
+ __aeabi_d2uiz 0x08007155 Thumb Code 0 dfixu.o(x$fpl$dfixu)
+ _dfixu 0x08007155 Thumb Code 90 dfixu.o(x$fpl$dfixu)
+ __aeabi_i2d 0x080071af Thumb Code 0 dflt_clz.o(x$fpl$dflt)
+ _dflt 0x080071af Thumb Code 46 dflt_clz.o(x$fpl$dflt)
+ __aeabi_l2d 0x080071dd Thumb Code 0 dfltll_clz.o(x$fpl$dfltll)
+ _ll_sto_d 0x080071dd Thumb Code 162 dfltll_clz.o(x$fpl$dfltll)
+ __aeabi_dmul 0x08007281 Thumb Code 0 dmul.o(x$fpl$dmul)
+ _dmul 0x08007281 Thumb Code 332 dmul.o(x$fpl$dmul)
+ __fpl_dnaninf 0x080073d5 Thumb Code 156 dnaninf.o(x$fpl$dnaninf)
+ __fpl_dretinf 0x08007471 Thumb Code 12 dretinf.o(x$fpl$dretinf)
+ __aeabi_dsub 0x0800747d Thumb Code 0 daddsub_clz.o(x$fpl$dsub)
+ _dsub 0x0800747d Thumb Code 464 daddsub_clz.o(x$fpl$dsub)
+ _fp_init 0x08007651 Thumb Code 10 fpinit.o(x$fpl$fpinit)
+ __fplib_config_fpu_vfp 0x08007659 Thumb Code 0 fpinit.o(x$fpl$fpinit)
+ __fplib_config_pureend_doubles 0x08007659 Thumb Code 0 fpinit.o(x$fpl$fpinit)
+ __I$use$fp 0x0800765a Number 0 usenofp.o(x$fpl$usenofp)
+ AHBPrescTable 0x08007662 Data 16 system_stm32f4xx.o(.constdata)
+ APBPrescTable 0x08007672 Data 8 system_stm32f4xx.o(.constdata)
+ Region$$Table$$Base 0x0800767c Number 0 anon$$obj.o(Region$$Table)
+ Region$$Table$$Limit 0x0800769c Number 0 anon$$obj.o(Region$$Table)
uwTick 0x20000000 Data 4 stm32f4xx_hal.o(.data)
uwTickPrio 0x20000004 Data 4 stm32f4xx_hal.o(.data)
uwTickFreq 0x20000008 Data 1 stm32f4xx_hal.o(.data)
@@ -3670,47 +3670,49 @@ Image Symbol Table
it_100ms_cnt_pv 0x20000134 Data 4 timer.o(.data)
it_50ms_flag_pv 0x20000138 Data 4 timer.o(.data)
it_50ms_cnt_pv 0x2000013c Data 4 timer.o(.data)
- exit_check 0x20000140 Data 1 timer.o(.data)
- RxBuffer 0x20000144 Data 1 uarts.o(.data)
- __stdout 0x20000148 Data 4 uarts.o(.data)
- ao_dwq 0x2000014c Data 4 provalctrl.o(.data)
- ao_blf1 0x20000150 Data 4 provalctrl.o(.data)
- ao_blf2 0x20000154 Data 4 provalctrl.o(.data)
- atm_pressure 0x20000158 Data 4 provalctrl.o(.data)
- last_encode_num 0x2000015c Data 4 encoder.o(.data)
- curr_encode_num 0x20000160 Data 4 encoder.o(.data)
- encode_num 0x20000164 Data 4 encoder.o(.data)
- cnt_update 0x20000168 Data 4 encoder.o(.data)
- hadc1 0x2000016c Data 72 adc.o(.bss)
- hdma_adc1 0x200001b4 Data 96 adc.o(.bss)
- hi2c1 0x20000214 Data 84 i2c.o(.bss)
- hspi2 0x20000268 Data 88 spi.o(.bss)
- htim1 0x200002c0 Data 72 tim.o(.bss)
- htim6 0x20000308 Data 72 tim.o(.bss)
- htim7 0x20000350 Data 72 tim.o(.bss)
- huart4 0x20000398 Data 72 usart.o(.bss)
- huart1 0x200003e0 Data 72 usart.o(.bss)
- huart2 0x20000428 Data 72 usart.o(.bss)
- huart3 0x20000470 Data 72 usart.o(.bss)
- huart6 0x200004b8 Data 72 usart.o(.bss)
- hdma_uart4_tx 0x20000500 Data 96 usart.o(.bss)
- hdma_usart1_tx 0x20000560 Data 96 usart.o(.bss)
- hdma_usart2_tx 0x200005c0 Data 96 usart.o(.bss)
- hdma_usart3_tx 0x20000620 Data 96 usart.o(.bss)
- hdma_usart6_tx 0x20000680 Data 96 usart.o(.bss)
- ads1220_data 0x200006e0 Data 16 ads1220.o(.bss)
- ads_v 0x200006f0 Data 160 ads1220.o(.bss)
- p_flt_window 0x20000790 Data 480 mf5803.o(.bss)
- InputReg 0x20000970 Data 98 modbus.o(.bss)
- SamVarReg 0x200009d2 Data 98 modbus.o(.bss)
- uart1_rx_buf 0x20000a34 Data 1024 modbus_rtu.o(.bss)
- uart1_tx_buf 0x20000e34 Data 1024 modbus_rtu.o(.bss)
- UART6_RxBuffer 0x20001234 Data 256 uarts.o(.bss)
- uart1 0x20001334 Data 20 uarts.o(.bss)
- pv_one 0x20001348 Data 56 provalctrl.o(.bss)
- pv_two 0x20001380 Data 56 provalctrl.o(.bss)
- __libspace_start 0x200013b8 Data 96 libspace.o(.bss)
- __temporary_stack_top$libspace 0x20001418 Data 0 libspace.o(.bss)
+ it_30ms_flag_pv 0x20000140 Data 4 timer.o(.data)
+ it_30ms_cnt_pv 0x20000144 Data 4 timer.o(.data)
+ exit_check 0x20000148 Data 1 timer.o(.data)
+ RxBuffer 0x2000014c Data 1 uarts.o(.data)
+ __stdout 0x20000150 Data 4 uarts.o(.data)
+ ao_dwq 0x20000154 Data 4 provalctrl.o(.data)
+ ao_blf1 0x20000158 Data 4 provalctrl.o(.data)
+ ao_blf2 0x2000015c Data 4 provalctrl.o(.data)
+ atm_pressure 0x20000160 Data 4 provalctrl.o(.data)
+ last_encode_num 0x20000164 Data 4 encoder.o(.data)
+ curr_encode_num 0x20000168 Data 4 encoder.o(.data)
+ encode_num 0x2000016c Data 4 encoder.o(.data)
+ cnt_update 0x20000170 Data 4 encoder.o(.data)
+ hadc1 0x20000174 Data 72 adc.o(.bss)
+ hdma_adc1 0x200001bc Data 96 adc.o(.bss)
+ hi2c1 0x2000021c Data 84 i2c.o(.bss)
+ hspi2 0x20000270 Data 88 spi.o(.bss)
+ htim1 0x200002c8 Data 72 tim.o(.bss)
+ htim6 0x20000310 Data 72 tim.o(.bss)
+ htim7 0x20000358 Data 72 tim.o(.bss)
+ huart4 0x200003a0 Data 72 usart.o(.bss)
+ huart1 0x200003e8 Data 72 usart.o(.bss)
+ huart2 0x20000430 Data 72 usart.o(.bss)
+ huart3 0x20000478 Data 72 usart.o(.bss)
+ huart6 0x200004c0 Data 72 usart.o(.bss)
+ hdma_uart4_tx 0x20000508 Data 96 usart.o(.bss)
+ hdma_usart1_tx 0x20000568 Data 96 usart.o(.bss)
+ hdma_usart2_tx 0x200005c8 Data 96 usart.o(.bss)
+ hdma_usart3_tx 0x20000628 Data 96 usart.o(.bss)
+ hdma_usart6_tx 0x20000688 Data 96 usart.o(.bss)
+ ads1220_data 0x200006e8 Data 16 ads1220.o(.bss)
+ ads_v 0x200006f8 Data 160 ads1220.o(.bss)
+ p_flt_window 0x20000798 Data 240 mf5803.o(.bss)
+ InputReg 0x20000888 Data 98 modbus.o(.bss)
+ SamVarReg 0x200008ea Data 98 modbus.o(.bss)
+ uart1_rx_buf 0x2000094c Data 1024 modbus_rtu.o(.bss)
+ uart1_tx_buf 0x20000d4c Data 1024 modbus_rtu.o(.bss)
+ UART6_RxBuffer 0x2000114c Data 256 uarts.o(.bss)
+ uart1 0x2000124c Data 20 uarts.o(.bss)
+ pv_one 0x20001260 Data 56 provalctrl.o(.bss)
+ pv_two 0x20001298 Data 56 provalctrl.o(.bss)
+ __libspace_start 0x200012d0 Data 96 libspace.o(.bss)
+ __temporary_stack_top$libspace 0x20001330 Data 0 libspace.o(.bss)
@@ -3720,9 +3722,9 @@ Memory Map of the image
Image Entry point : 0x08000189
- Load Region LR_IROM1 (Base: 0x08000000, Size: 0x000077d4, Max: 0x00100000, ABSOLUTE, COMPRESSED[0x0000767c])
+ Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00007810, Max: 0x00100000, ABSOLUTE, COMPRESSED[0x000076b0])
- Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00007668, Max: 0x00100000, ABSOLUTE)
+ Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x0000769c, Max: 0x00100000, ABSOLUTE)
Exec Addr Load Addr Size Type Attr Idx E Section Name Object
@@ -3987,45 +3989,45 @@ Memory Map of the image
0x08005d70 0x08005d70 0x00000080 Code RO 5093 i.modbus_errfunction_rtu modbus_rtu.o
0x08005df0 0x08005df0 0x00000044 Code RO 5094 i.modbus_process_rtu modbus_rtu.o
0x08005e34 0x08005e34 0x00000054 Code RO 5095 i.modbus_rtu_init modbus_rtu.o
- 0x08005e88 0x08005e88 0x00000080 Code RO 5096 i.modbus_rx_cb modbus_rtu.o
- 0x08005f08 0x08005f08 0x00000132 Code RO 5946 i.prov_calibrate_step provalctrl.o
- 0x0800603a 0x0800603a 0x00000002 PAD
- 0x0800603c 0x0800603c 0x000000c0 Code RO 5947 i.prov_ctrl provalctrl.o
- 0x080060fc 0x080060fc 0x00000108 Code RO 5948 i.prov_init provalctrl.o
- 0x08006204 0x08006204 0x00000150 Code RO 5097 i.readcoilstate_rtu modbus_rtu.o
- 0x08006354 0x08006354 0x0000014c Code RO 5098 i.readdisinputstate_rtu modbus_rtu.o
- 0x080064a0 0x080064a0 0x0000010c Code RO 5099 i.readholdreg_rtu modbus_rtu.o
- 0x080065ac 0x080065ac 0x00000104 Code RO 5100 i.readinputreg_rtu modbus_rtu.o
- 0x080066b0 0x080066b0 0x00000068 Code RO 4733 i.setcs ms5803.o
- 0x08006718 0x08006718 0x00000184 Code RO 5851 i.tim6_cnt timer.o
- 0x0800689c 0x0800689c 0x00000014 Code RO 5894 i.uart_send uarts.o
- 0x080068b0 0x080068b0 0x00000022 Code RO 4954 i.wf5803_ReadReg mf5803.o
- 0x080068d2 0x080068d2 0x00000022 Code RO 4956 i.wf5803_WriteReg mf5803.o
- 0x080068f4 0x080068f4 0x0000014c Code RO 5101 i.writemulticoil_rtu modbus_rtu.o
- 0x08006a40 0x08006a40 0x00000104 Code RO 5102 i.writemultireg_rtu modbus_rtu.o
- 0x08006b44 0x08006b44 0x000000c4 Code RO 5103 i.writesinglecoil_rtu modbus_rtu.o
- 0x08006c08 0x08006c08 0x000000b8 Code RO 5104 i.writesinglereg_rtu modbus_rtu.o
- 0x08006cc0 0x08006cc0 0x00000150 Code RO 6104 x$fpl$dadd fz_wm.l(daddsub_clz.o)
- 0x08006e10 0x08006e10 0x000002b0 Code RO 6111 x$fpl$ddiv fz_wm.l(ddiv.o)
- 0x080070c0 0x080070c0 0x0000005e Code RO 6114 x$fpl$dfix fz_wm.l(dfix.o)
- 0x0800711e 0x0800711e 0x00000002 PAD
- 0x08007120 0x08007120 0x0000005a Code RO 6122 x$fpl$dfixu fz_wm.l(dfixu.o)
- 0x0800717a 0x0800717a 0x0000002e Code RO 6127 x$fpl$dflt fz_wm.l(dflt_clz.o)
- 0x080071a8 0x080071a8 0x000000a2 Code RO 6132 x$fpl$dfltll fz_wm.l(dfltll_clz.o)
- 0x0800724a 0x0800724a 0x00000002 PAD
- 0x0800724c 0x0800724c 0x00000154 Code RO 6136 x$fpl$dmul fz_wm.l(dmul.o)
- 0x080073a0 0x080073a0 0x0000009c Code RO 6168 x$fpl$dnaninf fz_wm.l(dnaninf.o)
- 0x0800743c 0x0800743c 0x0000000c Code RO 6170 x$fpl$dretinf fz_wm.l(dretinf.o)
- 0x08007448 0x08007448 0x000001d4 Code RO 6106 x$fpl$dsub fz_wm.l(daddsub_clz.o)
- 0x0800761c 0x0800761c 0x0000000a Code RO 6339 x$fpl$fpinit fz_wm.l(fpinit.o)
- 0x08007626 0x08007626 0x00000000 Code RO 6176 x$fpl$usenofp fz_wm.l(usenofp.o)
- 0x08007626 0x08007626 0x00000008 Data RO 1568 .constdata stm32f4xx_hal_dma.o
- 0x0800762e 0x0800762e 0x00000018 Data RO 4413 .constdata system_stm32f4xx.o
- 0x08007646 0x08007646 0x00000002 PAD
- 0x08007648 0x08007648 0x00000020 Data RO 6395 Region$$Table anon$$obj.o
+ 0x08005e88 0x08005e88 0x00000084 Code RO 5096 i.modbus_rx_cb modbus_rtu.o
+ 0x08005f0c 0x08005f0c 0x00000132 Code RO 5946 i.prov_calibrate_step provalctrl.o
+ 0x0800603e 0x0800603e 0x00000002 PAD
+ 0x08006040 0x08006040 0x000000c4 Code RO 5947 i.prov_ctrl provalctrl.o
+ 0x08006104 0x08006104 0x0000010c Code RO 5948 i.prov_init provalctrl.o
+ 0x08006210 0x08006210 0x00000150 Code RO 5097 i.readcoilstate_rtu modbus_rtu.o
+ 0x08006360 0x08006360 0x0000014c Code RO 5098 i.readdisinputstate_rtu modbus_rtu.o
+ 0x080064ac 0x080064ac 0x0000010c Code RO 5099 i.readholdreg_rtu modbus_rtu.o
+ 0x080065b8 0x080065b8 0x00000104 Code RO 5100 i.readinputreg_rtu modbus_rtu.o
+ 0x080066bc 0x080066bc 0x00000068 Code RO 4733 i.setcs ms5803.o
+ 0x08006724 0x08006724 0x000001ac Code RO 5851 i.tim6_cnt timer.o
+ 0x080068d0 0x080068d0 0x00000014 Code RO 5894 i.uart_send uarts.o
+ 0x080068e4 0x080068e4 0x00000022 Code RO 4954 i.wf5803_ReadReg mf5803.o
+ 0x08006906 0x08006906 0x00000022 Code RO 4956 i.wf5803_WriteReg mf5803.o
+ 0x08006928 0x08006928 0x0000014c Code RO 5101 i.writemulticoil_rtu modbus_rtu.o
+ 0x08006a74 0x08006a74 0x00000104 Code RO 5102 i.writemultireg_rtu modbus_rtu.o
+ 0x08006b78 0x08006b78 0x000000c4 Code RO 5103 i.writesinglecoil_rtu modbus_rtu.o
+ 0x08006c3c 0x08006c3c 0x000000b8 Code RO 5104 i.writesinglereg_rtu modbus_rtu.o
+ 0x08006cf4 0x08006cf4 0x00000150 Code RO 6104 x$fpl$dadd fz_wm.l(daddsub_clz.o)
+ 0x08006e44 0x08006e44 0x000002b0 Code RO 6111 x$fpl$ddiv fz_wm.l(ddiv.o)
+ 0x080070f4 0x080070f4 0x0000005e Code RO 6114 x$fpl$dfix fz_wm.l(dfix.o)
+ 0x08007152 0x08007152 0x00000002 PAD
+ 0x08007154 0x08007154 0x0000005a Code RO 6122 x$fpl$dfixu fz_wm.l(dfixu.o)
+ 0x080071ae 0x080071ae 0x0000002e Code RO 6127 x$fpl$dflt fz_wm.l(dflt_clz.o)
+ 0x080071dc 0x080071dc 0x000000a2 Code RO 6132 x$fpl$dfltll fz_wm.l(dfltll_clz.o)
+ 0x0800727e 0x0800727e 0x00000002 PAD
+ 0x08007280 0x08007280 0x00000154 Code RO 6136 x$fpl$dmul fz_wm.l(dmul.o)
+ 0x080073d4 0x080073d4 0x0000009c Code RO 6168 x$fpl$dnaninf fz_wm.l(dnaninf.o)
+ 0x08007470 0x08007470 0x0000000c Code RO 6170 x$fpl$dretinf fz_wm.l(dretinf.o)
+ 0x0800747c 0x0800747c 0x000001d4 Code RO 6106 x$fpl$dsub fz_wm.l(daddsub_clz.o)
+ 0x08007650 0x08007650 0x0000000a Code RO 6339 x$fpl$fpinit fz_wm.l(fpinit.o)
+ 0x0800765a 0x0800765a 0x00000000 Code RO 6176 x$fpl$usenofp fz_wm.l(usenofp.o)
+ 0x0800765a 0x0800765a 0x00000008 Data RO 1568 .constdata stm32f4xx_hal_dma.o
+ 0x08007662 0x08007662 0x00000018 Data RO 4413 .constdata system_stm32f4xx.o
+ 0x0800767a 0x0800767a 0x00000002 PAD
+ 0x0800767c 0x0800767c 0x00000020 Data RO 6395 Region$$Table anon$$obj.o
- Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08007668, Size: 0x00001a18, Max: 0x0001c000, ABSOLUTE, COMPRESSED[0x00000014])
+ Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x0800769c, Size: 0x00001930, Max: 0x0001c000, ABSOLUTE, COMPRESSED[0x00000014])
Exec Addr Load Addr Size Type Attr Idx E Section Name Object
@@ -4042,28 +4044,28 @@ Memory Map of the image
0x2000007a COMPRESSED 0x0000006e Data RW 5032 .data modbus.o
0x200000e8 COMPRESSED 0x00000006 Data RW 5777 .data adcs.o
0x200000ee COMPRESSED 0x00000002 Data RW 5818 .data gpios.o
- 0x200000f0 COMPRESSED 0x00000051 Data RW 5852 .data timer.o
- 0x20000141 COMPRESSED 0x00000003 PAD
- 0x20000144 COMPRESSED 0x00000008 Data RW 5896 .data uarts.o
- 0x2000014c COMPRESSED 0x00000010 Data RW 5950 .data provalctrl.o
- 0x2000015c COMPRESSED 0x00000010 Data RW 5996 .data encoder.o
- 0x2000016c - 0x000000a8 Zero RW 308 .bss adc.o
- 0x20000214 - 0x00000054 Zero RW 374 .bss i2c.o
- 0x20000268 - 0x00000058 Zero RW 416 .bss spi.o
- 0x200002c0 - 0x000000d8 Zero RW 462 .bss tim.o
- 0x20000398 - 0x00000348 Zero RW 528 .bss usart.o
- 0x200006e0 - 0x000000b0 Zero RW 4512 .bss ads1220.o
- 0x20000790 - 0x000001e0 Zero RW 4957 .bss mf5803.o
- 0x20000970 - 0x000000c4 Zero RW 5031 .bss modbus.o
- 0x20000a34 - 0x00000800 Zero RW 5105 .bss modbus_rtu.o
- 0x20001234 - 0x00000114 Zero RW 5895 .bss uarts.o
- 0x20001348 - 0x00000070 Zero RW 5949 .bss provalctrl.o
- 0x200013b8 - 0x00000060 Zero RW 6249 .bss c_w.l(libspace.o)
- 0x20001418 - 0x00000200 Zero RW 2 HEAP startup_stm32f407xx.o
- 0x20001618 - 0x00000400 Zero RW 1 STACK startup_stm32f407xx.o
+ 0x200000f0 COMPRESSED 0x00000059 Data RW 5852 .data timer.o
+ 0x20000149 COMPRESSED 0x00000003 PAD
+ 0x2000014c COMPRESSED 0x00000008 Data RW 5896 .data uarts.o
+ 0x20000154 COMPRESSED 0x00000010 Data RW 5950 .data provalctrl.o
+ 0x20000164 COMPRESSED 0x00000010 Data RW 5996 .data encoder.o
+ 0x20000174 - 0x000000a8 Zero RW 308 .bss adc.o
+ 0x2000021c - 0x00000054 Zero RW 374 .bss i2c.o
+ 0x20000270 - 0x00000058 Zero RW 416 .bss spi.o
+ 0x200002c8 - 0x000000d8 Zero RW 462 .bss tim.o
+ 0x200003a0 - 0x00000348 Zero RW 528 .bss usart.o
+ 0x200006e8 - 0x000000b0 Zero RW 4512 .bss ads1220.o
+ 0x20000798 - 0x000000f0 Zero RW 4957 .bss mf5803.o
+ 0x20000888 - 0x000000c4 Zero RW 5031 .bss modbus.o
+ 0x2000094c - 0x00000800 Zero RW 5105 .bss modbus_rtu.o
+ 0x2000114c - 0x00000114 Zero RW 5895 .bss uarts.o
+ 0x20001260 - 0x00000070 Zero RW 5949 .bss provalctrl.o
+ 0x200012d0 - 0x00000060 Zero RW 6249 .bss c_w.l(libspace.o)
+ 0x20001330 - 0x00000200 Zero RW 2 HEAP startup_stm32f407xx.o
+ 0x20001530 - 0x00000400 Zero RW 1 STACK startup_stm32f407xx.o
- Execution Region RW_IRAM2 (Exec base: 0x2001c000, Load base: 0x0800767c, Size: 0x00000000, Max: 0x00004000, ABSOLUTE)
+ Execution Region RW_IRAM2 (Exec base: 0x2001c000, Load base: 0x080076b0, Size: 0x00000000, Max: 0x00004000, ABSOLUTE)
**** No section assigned to this execution region ****
@@ -4089,11 +4091,11 @@ Image component sizes
152 16 0 0 0 1206 hc595.o
196 26 0 0 84 1849 i2c.o
438 22 0 0 0 724907 main.o
- 968 70 0 25 480 5530 mf5803.o
+ 968 70 0 25 240 5526 mf5803.o
358 32 0 110 196 7180 modbus.o
- 2756 142 0 0 2048 13994 modbus_rtu.o
+ 2760 146 0 0 2048 13994 modbus_rtu.o
256 50 0 17 0 3199 ms5803.o
- 1270 92 0 16 112 4240 provalctrl.o
+ 1278 102 0 16 112 4268 provalctrl.o
204 22 0 0 88 1861 spi.o
64 26 392 0 1536 892 startup_stm32f407xx.o
212 36 0 9 0 9777 stm32f4xx_hal.o
@@ -4111,12 +4113,12 @@ Image component sizes
254 78 0 0 0 12324 stm32f4xx_it.o
20 6 24 4 0 1271 system_stm32f4xx.o
544 54 0 0 216 3946 tim.o
- 504 100 0 81 0 3341 timer.o
+ 544 110 0 89 0 3456 timer.o
48 6 0 8 276 5870 uarts.o
1288 114 0 0 840 5222 usart.o
----------------------------------------------------------------------
- 26520 1798 458 364 6220 932141 Object Totals
+ 26572 1822 458 372 5980 932280 Object Totals
0 0 32 0 0 0 (incl. Generated)
26 0 2 10 0 0 (incl. Padding)
@@ -4181,15 +4183,15 @@ Image component sizes
Code (inc. data) RO Data RW Data ZI Data Debug
- 29854 1990 458 364 6316 913489 Grand Totals
- 29854 1990 458 20 6316 913489 ELF Image Totals (compressed)
- 29854 1990 458 20 0 0 ROM Totals
+ 29906 2014 458 372 6076 913628 Grand Totals
+ 29906 2014 458 20 6076 913628 ELF Image Totals (compressed)
+ 29906 2014 458 20 0 0 ROM Totals
==============================================================================
- Total RO Size (Code + RO Data) 30312 ( 29.60kB)
- Total RW Size (RW Data + ZI Data) 6680 ( 6.52kB)
- Total ROM Size (Code + RO Data + RW Data) 30332 ( 29.62kB)
+ Total RO Size (Code + RO Data) 30364 ( 29.65kB)
+ Total RW Size (RW Data + ZI Data) 6448 ( 6.30kB)
+ Total ROM Size (Code + RO Data + RW Data) 30384 ( 29.67kB)
==============================================================================
diff --git a/MDK-ARM/VOQC/VOQC_VOQC.dep b/MDK-ARM/VOQC/VOQC_VOQC.dep
index f480b79..c613756 100644
--- a/MDK-ARM/VOQC/VOQC_VOQC.dep
+++ b/MDK-ARM/VOQC/VOQC_VOQC.dep
@@ -39,14 +39,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -61,12 +61,12 @@ I (../users/Inc/encoder.h)(0x66C3E76F)
I (../users/Inc/adcs.h)(0x66C3E770)
I (../board/Inc/ADS1256.h)(0x66960E51)
I (../board/Inc/ads1220.h)(0x66960D8E)
-I (../board/Inc/mf5803.h)(0x66986978)
+I (../board/Inc/mf5803.h)(0x66C69F5F)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\math.h)(0x5E8E3CC2)
I (../board/Inc/ms5803.h)(0x669760FF)
I (../board/Inc/ds18b20.h)(0x6694D35E)
I (../board/Inc/dac7311.h)(0x66949B65)
-I (../users/Inc/provalctrl.h)(0x66C42ED5)
+I (../users/Inc/provalctrl.h)(0x66C6FDCE)
F (../Core/Src/gpio.c)(0x66C2E5A9)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\gpio.o --omf_browse voqc\gpio.crf --depend voqc\gpio.d)
I (../Core/Inc/gpio.h)(0x668F85FA)
I (../Core/Inc/main.h)(0x6694D721)
@@ -106,14 +106,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -156,14 +156,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -206,14 +206,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -256,14 +256,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -306,14 +306,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
F (../Core/Src/tim.c)(0x66C2E5AF)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\tim.o --omf_browse voqc\tim.crf --depend voqc\tim.d)
@@ -355,13 +355,13 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -404,13 +404,13 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -452,14 +452,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -502,14 +502,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -1367,14 +1367,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -1417,18 +1417,18 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-I (../users/Inc/provalctrl.h)(0x66C42ED5)
+I (../users/Inc/provalctrl.h)(0x66C6FDCE)
F (..\board\Src\dac7311.c)(0x66AB21F7)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\dac7311.o --omf_browse voqc\dac7311.crf --depend voqc\dac7311.d)
I (../board/Inc/dac7311.h)(0x66949B65)
I (../Core/Inc/main.h)(0x6694D721)
@@ -1468,14 +1468,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -1518,18 +1518,18 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-F (..\board\Src\ms5803.c)(0x669A06F3)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\ms5803.o --omf_browse voqc\ms5803.crf --depend voqc\ms5803.d)
+F (..\board\Src\ms5803.c)(0x66C44393)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\ms5803.o --omf_browse voqc\ms5803.crf --depend voqc\ms5803.d)
I (../board/Inc/ms5803.h)(0x669760FF)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\math.h)(0x5E8E3CC2)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -1570,14 +1570,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
F (..\board\Src\ds18b20.c)(0x6694E519)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\ds18b20.o --omf_browse voqc\ds18b20.crf --depend voqc\ds18b20.d)
@@ -1619,14 +1619,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -1669,14 +1669,14 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -1719,19 +1719,19 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-F (..\board\Src\mf5803.c)(0x66C30291)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\mf5803.o --omf_browse voqc\mf5803.crf --depend voqc\mf5803.d)
-I (../board/Inc/mf5803.h)(0x66986978)
+F (..\board\Src\mf5803.c)(0x66C6A012)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\mf5803.o --omf_browse voqc\mf5803.crf --depend voqc\mf5803.d)
+I (../board/Inc/mf5803.h)(0x66C69F5F)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\math.h)(0x5E8E3CC2)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
I (../Core/Inc/main.h)(0x6694D721)
@@ -1771,21 +1771,21 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (../board/Inc/ms5803.h)(0x669760FF)
F (..\board\Src\laser.c)(0x668CAE17)()
-F (..\modbus\Src\modbus.c)(0x66B4A5F3)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\modbus.o --omf_browse voqc\modbus.crf --depend voqc\modbus.d)
+F (..\modbus\Src\modbus.c)(0x66C443C7)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\modbus.o --omf_browse voqc\modbus.crf --depend voqc\modbus.d)
I (../modbus/Inc/modbus.h)(0x669A1795)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../Core/Inc/main.h)(0x6694D721)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
@@ -1828,13 +1828,13 @@ I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-F (..\modbus\Src\modbus_rtu.c)(0x66B9BDFF)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\modbus_rtu.o --omf_browse voqc\modbus_rtu.crf --depend voqc\modbus_rtu.d)
+F (..\modbus\Src\modbus_rtu.c)(0x66C443CA)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\modbus_rtu.o --omf_browse voqc\modbus_rtu.crf --depend voqc\modbus_rtu.d)
I (../modbus/Inc/modbus.h)(0x669A1795)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../Core/Inc/main.h)(0x6694D721)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
@@ -1877,13 +1877,13 @@ I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-F (..\modbus\Src\modbus_tcp.c)(0x668CF2BE)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\modbus_tcp.o --omf_browse voqc\modbus_tcp.crf --depend voqc\modbus_tcp.d)
+F (..\modbus\Src\modbus_tcp.c)(0x66C443CD)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\modbus_tcp.o --omf_browse voqc\modbus_tcp.crf --depend voqc\modbus_tcp.d)
I (../modbus/Inc/modbus.h)(0x669A1795)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../Core/Inc/main.h)(0x6694D721)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
@@ -1926,13 +1926,13 @@ I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-F (..\CH395Q\ch395.c)(0x669607BE)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\ch395.o --omf_browse voqc\ch395.crf --depend voqc\ch395.d)
+F (..\CH395Q\ch395.c)(0x66C443A4)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\ch395.o --omf_browse voqc\ch395.crf --depend voqc\ch395.d)
I (..\CH395Q\ch395.h)(0x669605EC)
-I (..\CH395Q\ch395inc.h)(0x6683A7A7)
+I (..\CH395Q\ch395inc.h)(0x66C443B0)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
I (../Core/Inc/stm32f4xx_hal_conf.h)(0x66C2E5B0)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x66B41EAC)
@@ -1970,7 +1970,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
I (../Core/Inc/main.h)(0x6694D721)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
@@ -1980,8 +1980,8 @@ I (../CH395Q/ch395.h)(0x669605EC)
I (../Core/Inc/spi.h)(0x668F85FC)
I (..\CH395Q\ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-F (..\CH395Q\ch395cmd.c)(0x668CF94D)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\ch395cmd.o --omf_browse voqc\ch395cmd.crf --depend voqc\ch395cmd.d)
-I (..\CH395Q\ch395inc.h)(0x6683A7A7)
+F (..\CH395Q\ch395cmd.c)(0x66C443B1)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\ch395cmd.o --omf_browse voqc\ch395cmd.crf --depend voqc\ch395cmd.d)
+I (..\CH395Q\ch395inc.h)(0x66C443B0)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
I (../Core/Inc/stm32f4xx_hal_conf.h)(0x66C2E5B0)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_rcc.h)(0x66B41EAC)
@@ -2019,18 +2019,18 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
I (../Core/Inc/main.h)(0x6694D721)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
I (../Core/Inc/spi.h)(0x668F85FC)
-F (..\users\Src\adcs.c)(0x66C3E846)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\adcs.o --omf_browse voqc\adcs.crf --depend voqc\adcs.d)
+F (..\users\Src\adcs.c)(0x66C5534E)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\adcs.o --omf_browse voqc\adcs.crf --depend voqc\adcs.d)
I (../users/Inc/adcs.h)(0x66C3E770)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
I (../Core/Inc/stm32f4xx_hal_conf.h)(0x66C2E5B0)
@@ -2070,24 +2070,24 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
I (../Core/Inc/adc.h)(0x668F85FC)
I (../Core/Inc/main.h)(0x6694D721)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
I (../board/Inc/ADS1256.h)(0x66960E51)
I (../board/Inc/ads1220.h)(0x66960D8E)
-I (../board/Inc/mf5803.h)(0x66986978)
+I (../board/Inc/mf5803.h)(0x66C69F5F)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\math.h)(0x5E8E3CC2)
I (../board/Inc/ms5803.h)(0x669760FF)
I (../board/Inc/ds18b20.h)(0x6694D35E)
-F (..\users\Src\gpios.c)(0x66C3EBFF)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\gpios.o --omf_browse voqc\gpios.crf --depend voqc\gpios.d)
+F (..\users\Src\gpios.c)(0x66C55330)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\gpios.o --omf_browse voqc\gpios.crf --depend voqc\gpios.d)
I (../users/Inc/gpios.h)(0x66C3EA3F)
I (../Core/Inc/gpio.h)(0x668F85FA)
I (../Core/Inc/main.h)(0x6694D721)
@@ -2127,22 +2127,22 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
I (../board/Inc/hc595.h)(0x6695CC89)
I (../board/Inc/hc165.h)(0x6695D0CB)
I (../users/Inc/encoder.h)(0x66C3E76F)
-F (..\users\Src\timer.c)(0x66C43301)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\timer.o --omf_browse voqc\timer.crf --depend voqc\timer.d)
-I (../users/Inc/timer.h)(0x66C43301)
+F (..\users\Src\timer.c)(0x66C6F950)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\timer.o --omf_browse voqc\timer.crf --depend voqc\timer.d)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../Core/Inc/main.h)(0x6694D721)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
@@ -2186,11 +2186,11 @@ I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
-F (..\users\Src\uarts.c)(0x6695E35A)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\uarts.o --omf_browse voqc\uarts.crf --depend voqc\uarts.d)
+F (..\users\Src\uarts.c)(0x66C446D0)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\uarts.o --omf_browse voqc\uarts.crf --depend voqc\uarts.d)
I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (../Core/Inc/main.h)(0x6694D721)
@@ -2230,19 +2230,19 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_spi.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x66B41EAC)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x66B41EAC)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../modbus/Inc/modbus.h)(0x669A1795)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
-F (..\users\Src\provalctrl.c)(0x66C43F7B)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\provalctrl.o --omf_browse voqc\provalctrl.crf --depend voqc\provalctrl.d)
-I (../users/Inc/provalctrl.h)(0x66C42ED5)
+F (..\users\Src\provalctrl.c)(0x66C6FDCE)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\provalctrl.o --omf_browse voqc\provalctrl.crf --depend voqc\provalctrl.d)
+I (../users/Inc/provalctrl.h)(0x66C6FDCE)
I (../modbus/Inc/modbus.h)(0x669A1795)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../Core/Inc/main.h)(0x6694D721)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
@@ -2285,7 +2285,7 @@ I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
@@ -2293,7 +2293,7 @@ I (../board/Inc/dac7311.h)(0x66949B65)
F (..\users\Src\encoder.c)(0x66C43FCC)(--c99 -c --cpu Cortex-M4.fp.sp -g -O0 -Otime --apcs=interwork --split_sections -I ../Core/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc -I ../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy -I ../Drivers/CMSIS/Device/ST/STM32F4xx/Include -I ../Drivers/CMSIS/Include -I ../board/Inc -I ../CH395Q -I ../modbus/Inc -I ../users/Inc
-I.\RTE\_VOQC
-IC:\Users\admin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include
-IC:\Users\admin\AppData\Local\Arm\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include
-D__UVISION_VERSION="539" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx
-o voqc\encoder.o --omf_browse voqc\encoder.crf --depend voqc\encoder.d)
I (../users/Inc/encoder.h)(0x66C3E76F)
I (../modbus/Inc/modbus.h)(0x669A1795)
-I (../users/Inc/timer.h)(0x66C43301)
+I (../users/Inc/timer.h)(0x66C6F8D6)
I (../Core/Inc/tim.h)(0x6694D67D)
I (../Core/Inc/main.h)(0x6694D721)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
@@ -2336,7 +2336,7 @@ I (../users/Inc/uarts.h)(0x66B30E3E)
I (../Core/Inc/usart.h)(0x668F85FD)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\stdio.h)(0x5E8E3CC2)
I (../CH395Q/ch395.h)(0x669605EC)
-I (../CH395Q/ch395inc.h)(0x6683A7A7)
+I (../CH395Q/ch395inc.h)(0x66C443B0)
I (../Core/Inc/spi.h)(0x668F85FC)
I (../CH395Q/ch395cmd.h)(0x664FF969)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\string.h)(0x5E8E3CC2)
diff --git a/MDK-ARM/VOQC/adc.crf b/MDK-ARM/VOQC/adc.crf
index a0dc151..d99e7f6 100644
Binary files a/MDK-ARM/VOQC/adc.crf and b/MDK-ARM/VOQC/adc.crf differ
diff --git a/MDK-ARM/VOQC/adc.o b/MDK-ARM/VOQC/adc.o
index 806f58f..f292186 100644
Binary files a/MDK-ARM/VOQC/adc.o and b/MDK-ARM/VOQC/adc.o differ
diff --git a/MDK-ARM/VOQC/adcs.crf b/MDK-ARM/VOQC/adcs.crf
index 9bb9494..8bf9aa2 100644
Binary files a/MDK-ARM/VOQC/adcs.crf and b/MDK-ARM/VOQC/adcs.crf differ
diff --git a/MDK-ARM/VOQC/adcs.o b/MDK-ARM/VOQC/adcs.o
index 9c5aa1e..7c31836 100644
Binary files a/MDK-ARM/VOQC/adcs.o and b/MDK-ARM/VOQC/adcs.o differ
diff --git a/MDK-ARM/VOQC/ads1220.crf b/MDK-ARM/VOQC/ads1220.crf
index 4467e19..48b1f6d 100644
Binary files a/MDK-ARM/VOQC/ads1220.crf and b/MDK-ARM/VOQC/ads1220.crf differ
diff --git a/MDK-ARM/VOQC/ads1220.o b/MDK-ARM/VOQC/ads1220.o
index 379bba2..2cd63ce 100644
Binary files a/MDK-ARM/VOQC/ads1220.o and b/MDK-ARM/VOQC/ads1220.o differ
diff --git a/MDK-ARM/VOQC/ads1256.crf b/MDK-ARM/VOQC/ads1256.crf
index 977dfca..f38ca0a 100644
Binary files a/MDK-ARM/VOQC/ads1256.crf and b/MDK-ARM/VOQC/ads1256.crf differ
diff --git a/MDK-ARM/VOQC/ads1256.o b/MDK-ARM/VOQC/ads1256.o
index 8a751cd..d4d961f 100644
Binary files a/MDK-ARM/VOQC/ads1256.o and b/MDK-ARM/VOQC/ads1256.o differ
diff --git a/MDK-ARM/VOQC/ch395.crf b/MDK-ARM/VOQC/ch395.crf
index fa6580c..9ebc2ee 100644
Binary files a/MDK-ARM/VOQC/ch395.crf and b/MDK-ARM/VOQC/ch395.crf differ
diff --git a/MDK-ARM/VOQC/ch395.o b/MDK-ARM/VOQC/ch395.o
index b07de29..e10ea0a 100644
Binary files a/MDK-ARM/VOQC/ch395.o and b/MDK-ARM/VOQC/ch395.o differ
diff --git a/MDK-ARM/VOQC/ch395cmd.crf b/MDK-ARM/VOQC/ch395cmd.crf
index 93f4312..1d867bc 100644
Binary files a/MDK-ARM/VOQC/ch395cmd.crf and b/MDK-ARM/VOQC/ch395cmd.crf differ
diff --git a/MDK-ARM/VOQC/ch395cmd.o b/MDK-ARM/VOQC/ch395cmd.o
index e05ad32..6f0cb99 100644
Binary files a/MDK-ARM/VOQC/ch395cmd.o and b/MDK-ARM/VOQC/ch395cmd.o differ
diff --git a/MDK-ARM/VOQC/dac7311.crf b/MDK-ARM/VOQC/dac7311.crf
index 74c2e4b..bdc13e7 100644
Binary files a/MDK-ARM/VOQC/dac7311.crf and b/MDK-ARM/VOQC/dac7311.crf differ
diff --git a/MDK-ARM/VOQC/dac7311.o b/MDK-ARM/VOQC/dac7311.o
index 5185670..ae937ac 100644
Binary files a/MDK-ARM/VOQC/dac7311.o and b/MDK-ARM/VOQC/dac7311.o differ
diff --git a/MDK-ARM/VOQC/dma.crf b/MDK-ARM/VOQC/dma.crf
index fd400f5..3845da2 100644
Binary files a/MDK-ARM/VOQC/dma.crf and b/MDK-ARM/VOQC/dma.crf differ
diff --git a/MDK-ARM/VOQC/dma.o b/MDK-ARM/VOQC/dma.o
index 37f6ad7..7e4432a 100644
Binary files a/MDK-ARM/VOQC/dma.o and b/MDK-ARM/VOQC/dma.o differ
diff --git a/MDK-ARM/VOQC/ds18b20.crf b/MDK-ARM/VOQC/ds18b20.crf
index 4b6e9f6..6fa76b5 100644
Binary files a/MDK-ARM/VOQC/ds18b20.crf and b/MDK-ARM/VOQC/ds18b20.crf differ
diff --git a/MDK-ARM/VOQC/ds18b20.o b/MDK-ARM/VOQC/ds18b20.o
index 935a6a7..1ca34e4 100644
Binary files a/MDK-ARM/VOQC/ds18b20.o and b/MDK-ARM/VOQC/ds18b20.o differ
diff --git a/MDK-ARM/VOQC/eeprom.crf b/MDK-ARM/VOQC/eeprom.crf
index 80f316b..440ff29 100644
Binary files a/MDK-ARM/VOQC/eeprom.crf and b/MDK-ARM/VOQC/eeprom.crf differ
diff --git a/MDK-ARM/VOQC/eeprom.o b/MDK-ARM/VOQC/eeprom.o
index 1b18c43..f75d7a2 100644
Binary files a/MDK-ARM/VOQC/eeprom.o and b/MDK-ARM/VOQC/eeprom.o differ
diff --git a/MDK-ARM/VOQC/encoder.crf b/MDK-ARM/VOQC/encoder.crf
index 1736297..0bc3eb3 100644
Binary files a/MDK-ARM/VOQC/encoder.crf and b/MDK-ARM/VOQC/encoder.crf differ
diff --git a/MDK-ARM/VOQC/encoder.o b/MDK-ARM/VOQC/encoder.o
index 5441ac0..fb34c1a 100644
Binary files a/MDK-ARM/VOQC/encoder.o and b/MDK-ARM/VOQC/encoder.o differ
diff --git a/MDK-ARM/VOQC/gpio.crf b/MDK-ARM/VOQC/gpio.crf
index c204f27..9aa3cf2 100644
Binary files a/MDK-ARM/VOQC/gpio.crf and b/MDK-ARM/VOQC/gpio.crf differ
diff --git a/MDK-ARM/VOQC/gpio.o b/MDK-ARM/VOQC/gpio.o
index c435204..2e7e7fa 100644
Binary files a/MDK-ARM/VOQC/gpio.o and b/MDK-ARM/VOQC/gpio.o differ
diff --git a/MDK-ARM/VOQC/gpios.crf b/MDK-ARM/VOQC/gpios.crf
index 21d4375..cb20f91 100644
Binary files a/MDK-ARM/VOQC/gpios.crf and b/MDK-ARM/VOQC/gpios.crf differ
diff --git a/MDK-ARM/VOQC/gpios.o b/MDK-ARM/VOQC/gpios.o
index 73fb303..5720ca1 100644
Binary files a/MDK-ARM/VOQC/gpios.o and b/MDK-ARM/VOQC/gpios.o differ
diff --git a/MDK-ARM/VOQC/hc165.crf b/MDK-ARM/VOQC/hc165.crf
index 24ded6c..eb60153 100644
Binary files a/MDK-ARM/VOQC/hc165.crf and b/MDK-ARM/VOQC/hc165.crf differ
diff --git a/MDK-ARM/VOQC/hc165.o b/MDK-ARM/VOQC/hc165.o
index 581ecd6..cfc989f 100644
Binary files a/MDK-ARM/VOQC/hc165.o and b/MDK-ARM/VOQC/hc165.o differ
diff --git a/MDK-ARM/VOQC/hc595.crf b/MDK-ARM/VOQC/hc595.crf
index eae15d0..268c264 100644
Binary files a/MDK-ARM/VOQC/hc595.crf and b/MDK-ARM/VOQC/hc595.crf differ
diff --git a/MDK-ARM/VOQC/hc595.o b/MDK-ARM/VOQC/hc595.o
index 5491d25..2bfee10 100644
Binary files a/MDK-ARM/VOQC/hc595.o and b/MDK-ARM/VOQC/hc595.o differ
diff --git a/MDK-ARM/VOQC/i2c.crf b/MDK-ARM/VOQC/i2c.crf
index b25b476..0e881e4 100644
Binary files a/MDK-ARM/VOQC/i2c.crf and b/MDK-ARM/VOQC/i2c.crf differ
diff --git a/MDK-ARM/VOQC/i2c.o b/MDK-ARM/VOQC/i2c.o
index 2e29242..653a42d 100644
Binary files a/MDK-ARM/VOQC/i2c.o and b/MDK-ARM/VOQC/i2c.o differ
diff --git a/MDK-ARM/VOQC/main.crf b/MDK-ARM/VOQC/main.crf
index 7a85780..54d24b3 100644
Binary files a/MDK-ARM/VOQC/main.crf and b/MDK-ARM/VOQC/main.crf differ
diff --git a/MDK-ARM/VOQC/main.o b/MDK-ARM/VOQC/main.o
index febada6..5e6c403 100644
Binary files a/MDK-ARM/VOQC/main.o and b/MDK-ARM/VOQC/main.o differ
diff --git a/MDK-ARM/VOQC/mf5803.crf b/MDK-ARM/VOQC/mf5803.crf
index 28efca2..19b417f 100644
Binary files a/MDK-ARM/VOQC/mf5803.crf and b/MDK-ARM/VOQC/mf5803.crf differ
diff --git a/MDK-ARM/VOQC/mf5803.o b/MDK-ARM/VOQC/mf5803.o
index 4952957..b5cd938 100644
Binary files a/MDK-ARM/VOQC/mf5803.o and b/MDK-ARM/VOQC/mf5803.o differ
diff --git a/MDK-ARM/VOQC/modbus.crf b/MDK-ARM/VOQC/modbus.crf
index 0bd505c..185a5b3 100644
Binary files a/MDK-ARM/VOQC/modbus.crf and b/MDK-ARM/VOQC/modbus.crf differ
diff --git a/MDK-ARM/VOQC/modbus.o b/MDK-ARM/VOQC/modbus.o
index abf0968..6304c93 100644
Binary files a/MDK-ARM/VOQC/modbus.o and b/MDK-ARM/VOQC/modbus.o differ
diff --git a/MDK-ARM/VOQC/modbus_rtu.crf b/MDK-ARM/VOQC/modbus_rtu.crf
index 1aa4f3c..6f31b41 100644
Binary files a/MDK-ARM/VOQC/modbus_rtu.crf and b/MDK-ARM/VOQC/modbus_rtu.crf differ
diff --git a/MDK-ARM/VOQC/modbus_rtu.o b/MDK-ARM/VOQC/modbus_rtu.o
index 527e15f..7da303a 100644
Binary files a/MDK-ARM/VOQC/modbus_rtu.o and b/MDK-ARM/VOQC/modbus_rtu.o differ
diff --git a/MDK-ARM/VOQC/modbus_tcp.crf b/MDK-ARM/VOQC/modbus_tcp.crf
index 30597ab..af99d13 100644
Binary files a/MDK-ARM/VOQC/modbus_tcp.crf and b/MDK-ARM/VOQC/modbus_tcp.crf differ
diff --git a/MDK-ARM/VOQC/modbus_tcp.o b/MDK-ARM/VOQC/modbus_tcp.o
index 6a4fc6f..ca8503a 100644
Binary files a/MDK-ARM/VOQC/modbus_tcp.o and b/MDK-ARM/VOQC/modbus_tcp.o differ
diff --git a/MDK-ARM/VOQC/ms5803.crf b/MDK-ARM/VOQC/ms5803.crf
index 8fbad0a..a169f98 100644
Binary files a/MDK-ARM/VOQC/ms5803.crf and b/MDK-ARM/VOQC/ms5803.crf differ
diff --git a/MDK-ARM/VOQC/ms5803.o b/MDK-ARM/VOQC/ms5803.o
index 1f5ba90..a3be59a 100644
Binary files a/MDK-ARM/VOQC/ms5803.o and b/MDK-ARM/VOQC/ms5803.o differ
diff --git a/MDK-ARM/VOQC/provalctrl.crf b/MDK-ARM/VOQC/provalctrl.crf
index 4ab6fb7..5ea3321 100644
Binary files a/MDK-ARM/VOQC/provalctrl.crf and b/MDK-ARM/VOQC/provalctrl.crf differ
diff --git a/MDK-ARM/VOQC/provalctrl.o b/MDK-ARM/VOQC/provalctrl.o
index d9f9ed6..32f9034 100644
Binary files a/MDK-ARM/VOQC/provalctrl.o and b/MDK-ARM/VOQC/provalctrl.o differ
diff --git a/MDK-ARM/VOQC/spi.crf b/MDK-ARM/VOQC/spi.crf
index 2f41e0d..fe00d47 100644
Binary files a/MDK-ARM/VOQC/spi.crf and b/MDK-ARM/VOQC/spi.crf differ
diff --git a/MDK-ARM/VOQC/spi.o b/MDK-ARM/VOQC/spi.o
index 4e2ff32..3cb3995 100644
Binary files a/MDK-ARM/VOQC/spi.o and b/MDK-ARM/VOQC/spi.o differ
diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_msp.crf b/MDK-ARM/VOQC/stm32f4xx_hal_msp.crf
index f5196e1..8489df0 100644
Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_msp.crf and b/MDK-ARM/VOQC/stm32f4xx_hal_msp.crf differ
diff --git a/MDK-ARM/VOQC/stm32f4xx_hal_msp.o b/MDK-ARM/VOQC/stm32f4xx_hal_msp.o
index 0c6b2e7..c4ce723 100644
Binary files a/MDK-ARM/VOQC/stm32f4xx_hal_msp.o and b/MDK-ARM/VOQC/stm32f4xx_hal_msp.o differ
diff --git a/MDK-ARM/VOQC/stm32f4xx_it.crf b/MDK-ARM/VOQC/stm32f4xx_it.crf
index 82db63a..e0a2539 100644
Binary files a/MDK-ARM/VOQC/stm32f4xx_it.crf and b/MDK-ARM/VOQC/stm32f4xx_it.crf differ
diff --git a/MDK-ARM/VOQC/stm32f4xx_it.o b/MDK-ARM/VOQC/stm32f4xx_it.o
index 19525ba..21694a3 100644
Binary files a/MDK-ARM/VOQC/stm32f4xx_it.o and b/MDK-ARM/VOQC/stm32f4xx_it.o differ
diff --git a/MDK-ARM/VOQC/tim.crf b/MDK-ARM/VOQC/tim.crf
index cc0a2c3..8299592 100644
Binary files a/MDK-ARM/VOQC/tim.crf and b/MDK-ARM/VOQC/tim.crf differ
diff --git a/MDK-ARM/VOQC/tim.o b/MDK-ARM/VOQC/tim.o
index 05c9111..b000d27 100644
Binary files a/MDK-ARM/VOQC/tim.o and b/MDK-ARM/VOQC/tim.o differ
diff --git a/MDK-ARM/VOQC/timer.crf b/MDK-ARM/VOQC/timer.crf
index 8a2371a..c2a3501 100644
Binary files a/MDK-ARM/VOQC/timer.crf and b/MDK-ARM/VOQC/timer.crf differ
diff --git a/MDK-ARM/VOQC/timer.o b/MDK-ARM/VOQC/timer.o
index 2eab6ab..c221223 100644
Binary files a/MDK-ARM/VOQC/timer.o and b/MDK-ARM/VOQC/timer.o differ
diff --git a/MDK-ARM/VOQC/uarts.crf b/MDK-ARM/VOQC/uarts.crf
index 4f699e3..d44e4f3 100644
Binary files a/MDK-ARM/VOQC/uarts.crf and b/MDK-ARM/VOQC/uarts.crf differ
diff --git a/MDK-ARM/VOQC/uarts.o b/MDK-ARM/VOQC/uarts.o
index 7acd4ba..a355d57 100644
Binary files a/MDK-ARM/VOQC/uarts.o and b/MDK-ARM/VOQC/uarts.o differ
diff --git a/MDK-ARM/VOQC/usart.crf b/MDK-ARM/VOQC/usart.crf
index c7562c0..d521002 100644
Binary files a/MDK-ARM/VOQC/usart.crf and b/MDK-ARM/VOQC/usart.crf differ
diff --git a/MDK-ARM/VOQC/usart.o b/MDK-ARM/VOQC/usart.o
index 7512d6b..4882436 100644
Binary files a/MDK-ARM/VOQC/usart.o and b/MDK-ARM/VOQC/usart.o differ
diff --git a/board/Inc/mf5803.h b/board/Inc/mf5803.h
index 0d2ef38..0b810bf 100644
--- a/board/Inc/mf5803.h
+++ b/board/Inc/mf5803.h
@@ -19,6 +19,8 @@ void wf5803_ReadRegMulti(uint8_t addr, uint8_t lens, uint8_t* value);
void mf5803_setup(void);
void mf5803_loop(void);
+#define FLT_SIZE 10
+
#endif
/****END OF FILE****/
diff --git a/board/Src/mf5803.c b/board/Src/mf5803.c
index 0f6418c..c05c2d1 100644
--- a/board/Src/mf5803.c
+++ b/board/Src/mf5803.c
@@ -205,7 +205,7 @@ float press = 0; //kPa
float temp = 0; //℃
float fDat;
uint8_t flt_cnt = 0;
-float p_flt_window[6][20] = {0}; //sliding window, sensor_1&2 -> pressure[A,B,S]
+float p_flt_window[6][FLT_SIZE] = {0}; //sliding window, sensor_1&2 -> pressure[A,B,S]
void mf5803_loop()
{
float sums = 0;
@@ -229,25 +229,26 @@ void mf5803_loop()
NSS_Select++;
- if(NSS_Select > 3)
+ if(NSS_Select > 3) //记录完3路气压后进入此处，每3*10ms
{
SENSOR_SELECT(1);
+
+ for( uint8_t i = 0; i < 6; i++ ) //均值滤波
+ {
+ sums = 0;
+ for( uint8_t j = 0; j < FLT_SIZE; j++ )
+ {
+ sums += p_flt_window[i][j];
+ }
+ InputReg[ 13 + i ] = sums/FLT_SIZE; //InputReg[13]~InputReg[18]
+ }
}
if(NSS_Select > 6) //记录完6路气压后进入此处，每6*10ms
{
NSS_Select = 1;
-
- for( uint8_t i = 0; i < 6; i++ ) //均值滤波
- {
- sums = 0;
- for( uint8_t j = 0; j < 20; j++ )
- {
- sums += p_flt_window[i][j];
- }
- InputReg[ 13 + i ] = sums/20; //InputReg[13]~InputReg[18]
- }
+
flt_cnt++;
- if(flt_cnt > 19) //滑动窗口长度20，循环记录
+ if(flt_cnt > (FLT_SIZE - 1) ) //滑动窗口长度FLT_SIZE，循环记录
{
flt_cnt = 0;
}
diff --git a/users/Inc/provalctrl.h b/users/Inc/provalctrl.h
index cfa9865..788cd6f 100644
--- a/users/Inc/provalctrl.h
+++ b/users/Inc/provalctrl.h
@@ -42,4 +42,7 @@ void prov_calibrate_pid(void);
void prov_calibrate_step(propotion_valve *pvx);
void analog_ctrl(void);
+#define CSTEP_WAIT_MAX 0
+#define BIAS_MAX 10
+
#endif
diff --git a/users/Inc/timer.h b/users/Inc/timer.h
index c4c58cd..22726b7 100644
--- a/users/Inc/timer.h
+++ b/users/Inc/timer.h
@@ -25,6 +25,8 @@ extern int it_100ms_flag_pv;
extern int it_100ms_cnt_pv;
extern int it_50ms_flag_pv;
extern int it_50ms_cnt_pv;
+extern int it_30ms_flag_pv;
+extern int it_30ms_cnt_pv;
void HAL_TIM_PeriodElapsedCallback(TIM_HandleTypeDef *htim);
diff --git a/users/Src/provalctrl.c b/users/Src/provalctrl.c
index 12f5c20..ea7d69f 100644
--- a/users/Src/provalctrl.c
+++ b/users/Src/provalctrl.c
@@ -31,7 +31,7 @@ void prov_init(void) //比例阀结构体参数初始化
// pv_one.Kd = 0;
// pv_one.pidout = 0;
- pv_one.cstep = 0.005; //逐步接近的电流步长，mA
+ pv_one.cstep = 0.002; //逐步接近的电流步长，mA
pv_one.cstep_max = 0; //逐步接近的电流范围上限
pv_one.cstep_min = 0; //逐步接近的电流范围下限
pv_one.cstep_wait = 0;
@@ -75,8 +75,8 @@ void prov_ctrl(float target_p, propotion_valve *pvx)
pvx->target_pressure = pvx->target_percent/100*900; //Kpa, 比例阀 (4~20mA -> 0~0.9Mpa)
pvx->current_input = target_p; //记录当前理论模拟输出
- pvx->cstep_max = pvx->current_input*(float)1.25; //输出调节上限
- pvx->cstep_min = pvx->current_input*(float)0.75; //输出调节下限
+ pvx->cstep_max = pvx->current_input + (float)0.8; //输出调节上限
+ pvx->cstep_min = pvx->current_input - (float)0.8; //输出调节下限
pvx->cstep_wait = 0; //等待计数清零
pvx->pvout(target_p); //dac输出
@@ -138,13 +138,16 @@ void analog_ctrl(void)
prov_ctrl(ao_blf2,&pv_two); //控制比例阀2
}
- if(it_100ms_flag_pv == 1) //每隔100ms对输出进行一次校准
- {
- it_100ms_flag_pv = 0;
-
- prov_calibrate_step(&pv_one);
- prov_calibrate_step(&pv_two);
- }
+// if(it_100ms_flag_pv == 1) //每隔100ms对输出进行一次校准
+// {
+// it_100ms_flag_pv = 0;
+//
+// if( (CoilState[0]&(0x03)) == 0x03 ) //两个电磁阀都开启的情况下才进行校准
+// {
+// prov_calibrate_step(&pv_one);
+// prov_calibrate_step(&pv_two);
+// }
+// }
if(it_50ms_flag_pv == 1) //每隔50ms更新一次数据
{
@@ -161,6 +164,12 @@ void analog_ctrl(void)
pv_two.current_pressure = (InputReg[17] - atm_pressure)/(float)10; //Kpa，sensor1 B口绝压转表压
pv_two.current_percent = pv_two.current_pressure/900*100;
pv_two.bias = pv_two.target_percent - pv_two.current_percent;
+
+ if( (CoilState[0]&(0x03)) == 0x03 ) //两个电磁阀都开启的情况下才进行校准
+ {
+ prov_calibrate_step(&pv_one);
+ prov_calibrate_step(&pv_two);
+ }
}
}
@@ -171,7 +180,7 @@ void prov_calibrate_step(propotion_valve *pvx)
{
pvx->cstep_wait = (pvx->cstep_wait > 254)?(pvx->cstep_wait):(pvx->cstep_wait + 1); //每100ms加一次，上限255
- if( (pvx->bias > pvx->bias_area) && (pvx->bias < 5) && ( pvx->cstep_wait > 50) ) //目标更新5秒后，误差仍不符合条件时再进行微步调节
+ if( (pvx->bias > pvx->bias_area) && (pvx->bias < BIAS_MAX) && ( pvx->cstep_wait > CSTEP_WAIT_MAX) ) //目标更新X秒后，误差仍不符合条件时再进行微步调节
{
pvx->current_input += pvx->cstep;
@@ -181,7 +190,7 @@ void prov_calibrate_step(propotion_valve *pvx)
pvx->pvout(pvx->current_input);
}
- if( (pvx->bias < -pvx->bias_area) && (pvx->bias > -5) && ( pvx->cstep_wait > 50) ) //目标更新5秒后，误差仍不符合条件时再进行微步调节
+ if( (pvx->bias < -pvx->bias_area) && (pvx->bias > -BIAS_MAX) && ( pvx->cstep_wait > CSTEP_WAIT_MAX) ) //目标更新X秒后，误差仍不符合条件时再进行微步调节
{
pvx->current_input -= pvx->cstep;
diff --git a/users/Src/timer.c b/users/Src/timer.c
index 1cf7bf5..a4b74d6 100644
--- a/users/Src/timer.c
+++ b/users/Src/timer.c
@@ -19,9 +19,10 @@ int it_1000ms_cnt = 0;
int it_100ms_flag_pv = 0;
int it_100ms_cnt_pv = 0;
-
int it_50ms_flag_pv = 0;
int it_50ms_cnt_pv = 0;
+int it_30ms_flag_pv = 0;
+int it_30ms_cnt_pv = 0;
void tim6_cnt(void)
{
@@ -46,6 +47,8 @@ void tim6_cnt(void)
it_100ms_cnt_pv++;
if(it_50ms_cnt_pv > 49 ) { it_50ms_flag_pv = 1; it_50ms_cnt_pv = 0; }
it_50ms_cnt_pv++;
+ if(it_30ms_cnt_pv > 29 ) { it_30ms_flag_pv = 1; it_30ms_cnt_pv = 0; }
+ it_30ms_cnt_pv++;
}