wxsmart-test
/
acdt
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新：气动执行机构 移植至 调节阀健康诊断

This commit is contained in:
吴俊潮 2025-04-22 16:06:32 +08:00
parent 5418a0fc60
commit 55a69e2c5b
27 changed files with 273779 additions and 24469 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

287129
MDK-ARM/JLinkLog.txt
View File

File diff suppressed because it is too large Load Diff

152
MDK-ARM/VOQC.uvguix.admin
View File

File diff suppressed because one or more lines are too long

10
MDK-ARM/VOQC.uvoptx
View File

@ -220,6 +220,16 @@
<WinNumber>1</WinNumber>
<ItemText>reconnect_times,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
<ItemText>p_flt_window</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
<ItemText>temp_5803</ItemText>
</Ww>
</WatchWindow1>
<Tracepoint>
<THDelay>0</THDelay>

BIN
MDK-ARM/VOQC/VOQC.axf
View File

Binary file not shown.

4
MDK-ARM/VOQC/VOQC.build_log.htm
View File

@ -27,9 +27,9 @@ Project File Date: 04/09/2025
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\Bin'
Build target 'VOQC'
compiling ch395.c...
compiling gpios.c...
linking...
Program Size: Code=40974 RO-data=514 RW-data=548 ZI-data=10084
Program Size: Code=37462 RO-data=514 RW-data=516 ZI-data=9908
FromELF: creating hex file...
"VOQC\VOQC.axf" - 0 Error(s), 0 Warning(s).

4894
MDK-ARM/VOQC/VOQC.hex
View File

File diff suppressed because it is too large Load Diff

3426
MDK-ARM/VOQC/VOQC.htm
View File

File diff suppressed because it is too large Load Diff

2542
MDK-ARM/VOQC/VOQC.map
View File

File diff suppressed because it is too large Load Diff

18
MDK-ARM/VOQC/VOQC_VOQC.dep
View File

@ -1329,7 +1329,7 @@ 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)
F (..\board\Src\ads1256.c)(0x670DE1FD)(--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\ads1256.o --omf_browse voqc\ads1256.crf --depend voqc\ads1256.d)
F (..\board\Src\ads1256.c)(0x680733FB)(--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\ads1256.o --omf_browse voqc\ads1256.crf --depend voqc\ads1256.d)
I (../board/Inc/ADS1256.h)(0x66960E51)
I (../Core/Inc/main.h)(0x6694D721)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
@ -1737,7 +1737,7 @@ I (../CH395Q/ch395inc.h)(0x6800CA4E)
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)(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)
F (..\board\Src\mf5803.c)(0x6807456C)(--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)(0x66C7DE98)
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)
@ -1839,7 +1839,7 @@ I (../CH395Q/ch395.h)(0x67E5F98B)
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)(0x67E5F98B)(--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)
F (..\CH395Q\ch395cmd.c)(0x6800D1D9)(--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)(0x6800CA4E)
I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x66B41EAC)
I (../Core/Inc/stm32f4xx_hal_conf.h)(0x66C2E5B0)
@ -1889,7 +1889,7 @@ I (../CH395Q/ch395inc.h)(0x6800CA4E)
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 (..\modbus\Src\modbus.c)(0x67E5F98B)(--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)(0x68073A25)(--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)(0x67F6318A)
I (../users/Inc/timer.h)(0x67FF6230)
I (../Core/Inc/tim.h)(0x6694D67D)
@ -1938,7 +1938,7 @@ I (../CH395Q/ch395inc.h)(0x6800CA4E)
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)(0x67E5F98B)(--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)(0x680733FB)(--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)(0x67F6318A)
I (../users/Inc/timer.h)(0x67FF6230)
I (../Core/Inc/tim.h)(0x6694D67D)
@ -2040,7 +2040,7 @@ F (..\modbus\Inc\modbus.h)(0x67F6318A)()
F (..\CH395Q\ch395.h)(0x67E5F98B)()
F (..\CH395Q\ch395cmd.h)(0x664FF969)()
F (..\CH395Q\ch395inc.h)(0x6800CA4E)()
F (..\users\Src\adcs.c)(0x66EA886D)(--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)(0x6807430F)(--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)
@ -2097,7 +2097,7 @@ I (../board/Inc/mf5803.h)(0x66C7DE98)
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)(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)
F (..\users\Src\gpios.c)(0x6807471B)(--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)
@ -2249,7 +2249,7 @@ 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)(0x67F760E7)(--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)
F (..\users\Src\provalctrl.c)(0x680738B0)(--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)(0x67F6318A)
I (../modbus/Inc/modbus.h)(0x67F6318A)
I (../users/Inc/timer.h)(0x67FF6230)
@ -2302,7 +2302,7 @@ I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compile
I (../board/Inc/dac7311.h)(0x66949B65)
I (../board/Inc/eeprom.h)(0x67F6318A)
I (C:\Users\admin\Desktop\wujunchao\99_General softwares\Keil_v5\ARM\ARM Compiler_5_06\include\math.h)(0x5E8E3CC2)
F (..\users\Src\encoder.c)(0x66EA934B)(--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)
F (..\users\Src\encoder.c)(0x68073A40)(--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)(0x67F6318A)
I (../users/Inc/timer.h)(0x67FF6230)

BIN
MDK-ARM/VOQC/adcs.crf
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/adcs.o
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/encoder.crf
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/encoder.o
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/gpios.crf
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/gpios.o
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/mf5803.crf
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/mf5803.o
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/modbus.crf
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/modbus.o
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/provalctrl.crf
View File

Binary file not shown.

BIN
MDK-ARM/VOQC/provalctrl.o
View File

Binary file not shown.

26
board/Src/mf5803.c
View File

@ -202,7 +202,7 @@ void mf5803_setup()
long reading = 0;
float press = 0; //kPa
float temp = 0; //℃
long temp_5803 = 0; //℃
float fDat;
uint8_t flt_cnt = 0;
float p_flt_window[6][FLT_SIZE] = {0}; //sliding window, sensor_1&2 -> pressure[A,B,S]
@ -215,6 +215,7 @@ void mf5803_loop()
reading |= p1[1];
reading = reading << 8;
reading |= p1[2];
if(reading >= 8388608)
{
fDat = (int32_t)(reading - 16777216) / 8388608.0f;
@ -233,19 +234,36 @@ void mf5803_loop()
{
SENSOR_SELECT(1);
for( uint8_t i = 0; i < 6; i++ ) //均值滤波
for( uint8_t i = 3; 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]
InputReg[ 2 + i ] = sums/FLT_SIZE; //InputReg[13]~InputReg[18]
temp_5803 = p1[3];
temp_5803 = temp_5803 << 8;
temp_5803 += p1[4];
if (temp_5803 > 32768)
{
temp_5803 = (temp_5803 - 65844) / 256.0;
}
else
{
temp_5803 = (temp_5803 - 308) / 256.0;
}
if( (-50 <= temp_5803)&&(temp_5803 <= 100) )
{
InputReg[i + 13] = temp_5803*100;
}
}
}
if(NSS_Select > 6) //记录完6路气压后进入此处，每6*10ms
{
NSS_Select = 1;
NSS_Select = 4;
flt_cnt++;
if(flt_cnt > (FLT_SIZE - 1) ) //滑动窗口长度FLT_SIZE，循环记录

2
modbus/Src/modbus.c
View File

@ -3,7 +3,7 @@
uint8_t CoilState[(MAX_COIL_NUM + 7) / 8] = {0x00,0x00,0x00,0x00,0x00}; //线圈寄存器
uint8_t DisState[(MAX_DIS_NUM + 7) / 8] = {0x00,0x00,0x00,0x00,0x00,0x00}; //离散量寄存器
uint16_t InputReg[MAX_INPUT_REG_NUM] = {0x0000,0x0000,0x0000,0x0000}; //输入寄存器
uint16_t HoldReg[MAX_HOLD_REG_NUM] = {0, 0,0,0x00C8}; //保持寄存器
uint16_t HoldReg[MAX_HOLD_REG_NUM] = {0, 0, 200}; //保持寄存器
Var_Reg SamVarReg;

13
users/Src/adcs.c
View File

@ -15,14 +15,14 @@ short Temp = 0; //温度
void adcs_init(void)
{
HAL_ADC_Start_DMA(&hadc1, (uint32_t *)ADC_ConvertedValue, 1);
//HAL_ADC_Start_DMA(&hadc1, (uint32_t *)ADC_ConvertedValue, 1);
}
void adcs_data(void)
{
//HAL_ADC_Start(&hadc1);
//ADC_ConvertedValue = HAL_ADC_GetValue(&hadc1);
InputReg[12] = ADC_ConvertedValue;
HAL_ADC_Start(&hadc1);
ADC_ConvertedValue = HAL_ADC_GetValue(&hadc1);
InputReg[1] = ADC_ConvertedValue/4096.0*3300/0.082f;
}
void analog_gather(void)
@ -32,8 +32,9 @@ void analog_gather(void)
it_10ms_flag = 0;
mf5803_loop(); //sensor_1 and sensor_2, 气压检测
adcs_data(); //定位器输出回采
ads1256_get_data(); //8路模拟输入
ads1220_get_data(); //比例阀1&2，自带反馈 + 输出回采
InputReg[8] = 1009;
//ads1256_get_data(); //8路模拟输入
//ads1220_get_data(); //比例阀1&2，自带反馈 + 输出回采
}
if(it_100ms_flag == 1)

6
users/Src/encoder.c
View File

@ -26,7 +26,7 @@ void encoder_init(void)
encode_num = 0;
cnt_update = 152;
CoilState[3] &= 0x7F; //初始化完成后线圈寄存器0x28置零
CoilState[0] &= 0xFB; //初始化完成后线圈寄存器0x28置零
}
void encoder_run(void)
@ -39,8 +39,8 @@ void encoder_run(void)
else if((curr_encode_num - last_encode_num) > 50000) //向下溢出检测, o(0)->o(65535)
cnt_update--;
encode_num = curr_encode_num + cnt_update * 0xFFFF; //编码器，返回计数脉冲值
InputReg[20] = (encode_num >> 16) & 0xffff; //32位int 拆分成两个 uint16_t，高16位
InputReg[21] = encode_num & 0xffff; //32位int 拆分成两个 uint16_t，低16位
InputReg[10] = (encode_num >> 16) & 0xffff; //32位int 拆分成两个 uint16_t，高16位
InputReg[11] = encode_num & 0xffff; //32位int 拆分成两个 uint16_t，低16位
}

12
users/Src/gpios.c
View File

@ -16,11 +16,11 @@ void digital_ctrl()
led_ctrl();//指示灯
//八位DO输出控制
PE2_DO1((GPIO_PinState)((CoilState[0]>>0)&0x01));
PE3_DO2((GPIO_PinState)((CoilState[0]>>1)&0x01));
PE4_DO3((GPIO_PinState)((CoilState[0]>>2)&0x01));
PE5_DO4((GPIO_PinState)((CoilState[0]>>3)&0x01));
PE6_DO5((GPIO_PinState)((CoilState[0]>>4)&0x01));
PE2_DO1((GPIO_PinState)((CoilState[5]>>2)&0x01));
PE3_DO2((GPIO_PinState)((CoilState[5]>>3)&0x01));
PE4_DO3((GPIO_PinState)((CoilState[5]>>4)&0x01));
PE5_DO4((GPIO_PinState)((CoilState[5]>>5)&0x01));
PE6_DO5((GPIO_PinState)((CoilState[5]>>6)&0x01));
PC13_DO6((GPIO_PinState)((CoilState[0]>>5)&0x01));
PC14_DO7((GPIO_PinState)((CoilState[0]>>6)&0x01));
PC15_DO8((GPIO_PinState)((CoilState[0]>>7)&0x01));
@ -46,7 +46,7 @@ void digital_ctrl()
DisState[2] = DI_NAMUR1 + DI_NAMUR2 * 2;
//encoder reset
if( ((CoilState[3]>>7)&0x01) == 1 ) //CoilState[3]的D7位，地址0x28
if( ((CoilState[0]>>2)&0x01) == 1 ) //CoilState[3]的D7位，地址0x28
{
encoder_init();
}

14
users/Src/provalctrl.c
View File

@ -155,15 +155,15 @@ void analog_ctrl(void)
//prov_set(ao_blf1,&pv_one); //控制比例阀1
}
if(ao_blf2 != (float)(HoldReg[2]) / 1000) //保持寄存器值发生变化时dac输出
{
ao_blf2 = (float)(HoldReg[2]) / 1000; // uA -> mA
// if(ao_blf2 != (float)(HoldReg[2]) / 1000) //保持寄存器值发生变化时dac输出
// {
// ao_blf2 = (float)(HoldReg[2]) / 1000; // uA -> mA
ao_blf2 = current_output_calibrate(AO_2, ao_blf2);
// ao_blf2 = current_output_calibrate(AO_2, ao_blf2);
ao_blf2_set(ao_blf2);
//prov_set(ao_blf2,&pv_two); //控制比例阀2
}
// ao_blf2_set(ao_blf2);
// //prov_set(ao_blf2,&pv_two); //控制比例阀2
// }
#if ENABLE_SECTION_CAL
if( (CoilState[3]&(0x40)) == 0x40 ) //触发比例阀1自整定