diff --git a/Inf/Inf_4G.h b/Inf/Inf_4G.h index d7b606b..d96ff7e 100644 --- a/Inf/Inf_4G.h +++ b/Inf/Inf_4G.h @@ -19,13 +19,13 @@ #define STATUS_REPORT_INTERVAL 1000 // 状态上报间隔(ms) -#define MQTT_SERVER_IP "101.46.52.67" // 替换为你的MQTT服务器IP地址 +#define MQTT_SERVER_IP "101.133.141.167" // 替换为你的MQTT服务器IP地址 #define MQTT_SERVER_PORT "1883" // 替换为你的MQTT服务器端口 -#define MQTT_CLIENT_ID "LDMCU20250120A0001" // 替换为你的MQTT客户端ID +#define MQTT_CLIENT_ID "LDMCU20250522A0002" // 替换为你的MQTT客户端ID #define MQTT_USERNAME "ldhb" // 替换为你的MQTT用户名 #define MQTT_PASSWORD "ldhb0813" // 替换为你的MQTT密码 -#define MQTT_TOPIC "/server/coo/LDMCU20250120A0001" // 替换为你的MQTT订阅主题 -#define MQTT_PUB_TOPIC "/dev/coo/LDMCU20250120A0001" // 替换为你的MQTT订阅主题 +#define MQTT_TOPIC "/server/coo/LDMCU20250522A0002" // 替换为你的MQTT订阅主题 +#define MQTT_PUB_TOPIC "/dev/coo/LDMCU20250522A0002" // 替换为你的MQTT订阅主题 #define ICCID_LENGTH 20 diff --git a/MDK-ARM/.vscode/uv4.log b/MDK-ARM/.vscode/uv4.log index 63cbcf3..ba0cf83 100644 --- a/MDK-ARM/.vscode/uv4.log +++ b/MDK-ARM/.vscode/uv4.log @@ -1,18 +1,18 @@ *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'E:\MDK536\ARM\ARMCC\Bin' Build target '4G_test' -compiling Ozone.c... -compiling Driver.c... compiling Inf_4G.c... -compiling stm32f4xx_it.c... -compiling main.c... -compiling Irrigation.c... +compiling Ozone.c... compiling wendu.c... -compiling shuiliang.c... +compiling Irrigation.c... +compiling main.c... +compiling stm32f4xx_it.c... +compiling Driver.c... compiling HLW8032.c... -compiling guangshi.c... compiling electrode.c... -compiling Save_Time.c... compiling paini.c... +compiling shuiliang.c... +compiling Save_Time.c... +compiling guangshi.c... linking... Program Size: Code=35144 RO-data=896 RW-data=572 ZI-data=4092 FromELF: creating hex file... diff --git a/MDK-ARM/.vscode/uv4.log.lock b/MDK-ARM/.vscode/uv4.log.lock index 6c2c2ee..456c64e 100644 --- a/MDK-ARM/.vscode/uv4.log.lock +++ b/MDK-ARM/.vscode/uv4.log.lock @@ -1 +1 @@ -2025/5/21 13:19:43 \ No newline at end of file +2025/5/22 13:48:36 \ No newline at end of file diff --git a/MDK-ARM/4G_test/4G_test.axf b/MDK-ARM/4G_test/4G_test.axf index 558030a..a5606c3 100644 Binary files a/MDK-ARM/4G_test/4G_test.axf and b/MDK-ARM/4G_test/4G_test.axf differ diff --git a/MDK-ARM/4G_test/4G_test.build_log.htm b/MDK-ARM/4G_test/4G_test.build_log.htm index 95f6d45..e40c1f7 100644 --- a/MDK-ARM/4G_test/4G_test.build_log.htm +++ b/MDK-ARM/4G_test/4G_test.build_log.htm @@ -27,19 +27,19 @@ Project File Date: 04/22/2025
#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Wed May 21 13:19:40 2025
+
#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Thu May 22 13:48:32 2025
HAL_UART_IRQHandler (Thumb, 740 bytes, Stack size 40 bytes, stm32f4xx_hal_uart.o(i.HAL_UART_IRQHandler))
[Stack]
__hardfp_log (Thumb, 872 bytes, Stack size 88 bytes, log.o(i.__hardfp_log))
[Stack]
I2C_WaitOnMasterAddressFlagUntilTimeout (Thumb, 250 bytes, Stack size 24 bytes, stm32f4xx_hal_i2c.o(i.I2C_WaitOnMasterAddressFlagUntilTimeout))
@@ -2525,9 +2525,9 @@ Local Symbols
[Calls]
TIM_ITRx_SetConfig (Thumb, 18 bytes, Stack size 0 bytes, stm32f4xx_hal_tim.o(i.TIM_ITRx_SetConfig)) diff --git a/MDK-ARM/4G_test/4G_test.map b/MDK-ARM/4G_test/4G_test.map index 8e1a0fb..062d388 100644 --- a/MDK-ARM/4G_test/4G_test.map +++ b/MDK-ARM/4G_test/4G_test.map @@ -3400,7 +3400,7 @@ Image component sizes 196 26 0 0 84 1705 i2c.o 4300 1488 309 33 916 9038 inf_4g.o 2772 466 0 172 0 13200 irrigation.o - 874 210 0 26 0 722882 main.o + 874 210 0 26 0 722886 main.o 244 36 0 28 0 2675 ozone.o 72 12 0 25 0 963 paini.o 908 218 0 0 0 1308 save_time.o @@ -3423,7 +3423,7 @@ Image component sizes 448 76 0 28 0 2896 wendu.o ---------------------------------------------------------------------- - 28150 3720 768 564 4092 912921 Object Totals + 28150 3720 768 564 4092 912925 Object Totals 0 0 32 0 0 0 (incl. Generated) 26 0 3 16 3 0 (incl. Padding) @@ -3506,8 +3506,8 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 35144 3986 896 572 4092 896405 Grand Totals - 35144 3986 896 88 4092 896405 ELF Image Totals (compressed) + 35144 3986 896 572 4092 896409 Grand Totals + 35144 3986 896 88 4092 896409 ELF Image Totals (compressed) 35144 3986 896 88 0 0 ROM Totals ============================================================================== diff --git a/MDK-ARM/4G_test/4G_test_4G_test.dep b/MDK-ARM/4G_test/4G_test_4G_test.dep index 820157c..cab92ee 100644 --- a/MDK-ARM/4G_test/4G_test_4G_test.dep +++ b/MDK-ARM/4G_test/4G_test_4G_test.dep @@ -45,7 +45,7 @@ I (../Core/Inc/tim.h)(0x67D2914F) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) I (../Core/Inc/gpio.h)(0x6784B27B) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (E:\MDK536\ARM\ARMCC\include\stdlib.h)(0x60252374) I (../Driver/Driver.h)(0x68006484) @@ -332,7 +332,7 @@ I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/i2c.h)(0x67AD9C4F) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/tim.h)(0x67D2914F) I (E:\MDK536\ARM\ARMCC\include\stdlib.h)(0x60252374) I (../Driver/Driver.h)(0x68006484) @@ -1140,7 +1140,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) F (..\Inf\Inf_4G.c)(0x682D6204)(--c99 -c --cpu Cortex-M4.fp.sp -D__MICROLIB -g -O0 --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 ../Inf -I ../Driver -I ../App/Irrigation -I ../App/Ozone -I ../App/wendu -I ../App/HLW8032 -I ../App/EEPROM -I ../App/energy_manager -I ../App/electrode -I ../App/gungshi -I ../App/paini -I ../App/shuiliang -I ../App/SaveTime -I ../App/solar_energy -I.\RTE\_4G_test -IE:\MDK536\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IE:\MDK536\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -o 4g_test\inf_4g.o --omf_browse 4g_test\inf_4g.crf --depend 4g_test\inf_4g.d) -I (..\Inf\Inf_4G.h)(0x6822DCC7) +I (..\Inf\Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (../Core/Inc/main.h)(0x6800B78A) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x676CC4D6) @@ -1183,7 +1183,7 @@ I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) I (E:\MDK536\ARM\ARMCC\include\stdlib.h)(0x60252374) I (../Driver/Driver.h)(0x68006484) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../App/Irrigation/Irrigation.h)(0x67FF225D) I (../App/SaveTime/Save_Time.h)(0x67FE17E7) I (../App/EEPROM/EEPROM.h)(0x681C4BC2) @@ -1234,7 +1234,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) @@ -1297,7 +1297,7 @@ I (../App/EEPROM/EEPROM.h)(0x681C4BC2) I (../Core/Inc/i2c.h)(0x67AD9C4F) I (E:\MDK536\ARM\ARMCC\include\String.h)(0x6025237E) I (../App/Irrigation/Irrigation.h)(0x67FF225D) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\stdlib.h)(0x60252374) I (../Driver/Driver.h)(0x68006484) @@ -1348,7 +1348,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) I (../Driver/Driver.h)(0x68006484) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) @@ -1405,7 +1405,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) I (E:\MDK536\ARM\ARMCC\include\math.h)(0x60252378) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) @@ -1462,7 +1462,7 @@ I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/i2c.h)(0x67AD9C4F) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/tim.h)(0x67D2914F) I (E:\MDK536\ARM\ARMCC\include\stdlib.h)(0x60252374) I (../Driver/Driver.h)(0x68006484) @@ -1558,7 +1558,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) I (../Driver/Driver.h)(0x68006484) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) @@ -1614,7 +1614,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) I (../Driver/Driver.h)(0x68006484) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) @@ -1630,7 +1630,7 @@ I (../App/HLW8032/HLW8032.h)(0x67BEC1E4) I (../App/Ozone/Ozone.h)(0x682AED88) I (../App/electrode/electrode.h)(0x682D6241) I (../App/gungshi/guangshi.h)(0x6801C60B) -F (..\App\paini\paini.c)(0x68060727)(--c99 -c --cpu Cortex-M4.fp.sp -D__MICROLIB -g -O0 --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 ../Inf -I ../Driver -I ../App/Irrigation -I ../App/Ozone -I ../App/wendu -I ../App/HLW8032 -I ../App/EEPROM -I ../App/energy_manager -I ../App/electrode -I ../App/gungshi -I ../App/paini -I ../App/shuiliang -I ../App/SaveTime -I ../App/solar_energy -I.\RTE\_4G_test -IE:\MDK536\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IE:\MDK536\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -o 4g_test\paini.o --omf_browse 4g_test\paini.crf --depend 4g_test\paini.d) +F (..\App\paini\paini.c)(0x682D6339)(--c99 -c --cpu Cortex-M4.fp.sp -D__MICROLIB -g -O0 --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 ../Inf -I ../Driver -I ../App/Irrigation -I ../App/Ozone -I ../App/wendu -I ../App/HLW8032 -I ../App/EEPROM -I ../App/energy_manager -I ../App/electrode -I ../App/gungshi -I ../App/paini -I ../App/shuiliang -I ../App/SaveTime -I ../App/solar_energy -I.\RTE\_4G_test -IE:\MDK536\Packs\ARM\CMSIS\5.8.0\CMSIS\Core\Include -IE:\MDK536\Packs\Keil\STM32F4xx_DFP\2.15.0\Drivers\CMSIS\Device\ST\STM32F4xx\Include -D__UVISION_VERSION="536" -D_RTE_ -DSTM32F407xx -D_RTE_ -DUSE_HAL_DRIVER -DSTM32F407xx -o 4g_test\paini.o --omf_browse 4g_test\paini.crf --depend 4g_test\paini.d) I (..\App\paini\paini.h)(0x68060714) I (../Core/Inc/main.h)(0x6800B78A) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal.h)(0x676CC4D6) @@ -1670,7 +1670,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) I (../Driver/Driver.h)(0x68006484) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) @@ -1725,7 +1725,7 @@ I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_tim_ex.h)(0x676CC4D6) I (../Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_uart.h)(0x676CC4D6) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\string.h)(0x6025237E) I (../Core/Inc/tim.h)(0x67D2914F) @@ -1786,7 +1786,7 @@ I (../App/Irrigation/Irrigation.h)(0x67FF225D) I (E:\MDK536\ARM\ARMCC\include\stdio.h)(0x60252374) I (../Core/Inc/tim.h)(0x67D2914F) I (../App/SaveTime/Save_Time.h)(0x67FE17E7) -I (../Inf/Inf_4G.h)(0x6822DCC7) +I (../Inf/Inf_4G.h)(0x682EBA87) I (../Core/Inc/usart.h)(0x67AD5D28) I (E:\MDK536\ARM\ARMCC\include\stdlib.h)(0x60252374) I (../Driver/Driver.h)(0x68006484) diff --git a/MDK-ARM/4G_test/driver.crf b/MDK-ARM/4G_test/driver.crf index 4f33a04..5e423b7 100644 Binary files a/MDK-ARM/4G_test/driver.crf and b/MDK-ARM/4G_test/driver.crf differ diff --git a/MDK-ARM/4G_test/driver.o b/MDK-ARM/4G_test/driver.o index 0a56b43..7eef6e6 100644 Binary files a/MDK-ARM/4G_test/driver.o and b/MDK-ARM/4G_test/driver.o differ diff --git a/MDK-ARM/4G_test/electrode.crf b/MDK-ARM/4G_test/electrode.crf index 418a274..a374b4d 100644 Binary files a/MDK-ARM/4G_test/electrode.crf and b/MDK-ARM/4G_test/electrode.crf differ diff --git a/MDK-ARM/4G_test/electrode.o b/MDK-ARM/4G_test/electrode.o index 1a15c85..4a53a9e 100644 Binary files a/MDK-ARM/4G_test/electrode.o and b/MDK-ARM/4G_test/electrode.o differ diff --git a/MDK-ARM/4G_test/guangshi.crf b/MDK-ARM/4G_test/guangshi.crf index c676fcc..00e696f 100644 Binary files a/MDK-ARM/4G_test/guangshi.crf and b/MDK-ARM/4G_test/guangshi.crf differ diff --git a/MDK-ARM/4G_test/guangshi.o b/MDK-ARM/4G_test/guangshi.o index 95d61da..28d36e0 100644 Binary files a/MDK-ARM/4G_test/guangshi.o and b/MDK-ARM/4G_test/guangshi.o differ diff --git a/MDK-ARM/4G_test/hlw8032.crf b/MDK-ARM/4G_test/hlw8032.crf index 9350ad3..9fbebbd 100644 Binary files a/MDK-ARM/4G_test/hlw8032.crf and b/MDK-ARM/4G_test/hlw8032.crf differ diff --git a/MDK-ARM/4G_test/hlw8032.o b/MDK-ARM/4G_test/hlw8032.o index fc8e410..a79a6bc 100644 Binary files a/MDK-ARM/4G_test/hlw8032.o and b/MDK-ARM/4G_test/hlw8032.o differ diff --git a/MDK-ARM/4G_test/inf_4g.crf b/MDK-ARM/4G_test/inf_4g.crf index 190e609..d3889c1 100644 Binary files a/MDK-ARM/4G_test/inf_4g.crf and b/MDK-ARM/4G_test/inf_4g.crf differ diff --git a/MDK-ARM/4G_test/inf_4g.o b/MDK-ARM/4G_test/inf_4g.o index 81f127b..4b96153 100644 Binary files a/MDK-ARM/4G_test/inf_4g.o and b/MDK-ARM/4G_test/inf_4g.o differ diff --git a/MDK-ARM/4G_test/irrigation.crf b/MDK-ARM/4G_test/irrigation.crf index f9cbf50..0f57445 100644 Binary files a/MDK-ARM/4G_test/irrigation.crf and b/MDK-ARM/4G_test/irrigation.crf differ diff --git a/MDK-ARM/4G_test/irrigation.o b/MDK-ARM/4G_test/irrigation.o index 04dc888..b03a9ef 100644 Binary files a/MDK-ARM/4G_test/irrigation.o and b/MDK-ARM/4G_test/irrigation.o differ diff --git a/MDK-ARM/4G_test/main.crf b/MDK-ARM/4G_test/main.crf index 1d2237b..87f1efd 100644 Binary files a/MDK-ARM/4G_test/main.crf and b/MDK-ARM/4G_test/main.crf differ diff --git a/MDK-ARM/4G_test/main.o b/MDK-ARM/4G_test/main.o index 74e1896..787c373 100644 Binary files a/MDK-ARM/4G_test/main.o and b/MDK-ARM/4G_test/main.o differ diff --git a/MDK-ARM/4G_test/ozone.crf b/MDK-ARM/4G_test/ozone.crf index 3f81d0e..2c69966 100644 Binary files a/MDK-ARM/4G_test/ozone.crf and b/MDK-ARM/4G_test/ozone.crf differ diff --git a/MDK-ARM/4G_test/ozone.o b/MDK-ARM/4G_test/ozone.o index a8f051b..540da71 100644 Binary files a/MDK-ARM/4G_test/ozone.o and b/MDK-ARM/4G_test/ozone.o differ diff --git a/MDK-ARM/4G_test/paini.crf b/MDK-ARM/4G_test/paini.crf index bd1237c..a8192ea 100644 Binary files a/MDK-ARM/4G_test/paini.crf and b/MDK-ARM/4G_test/paini.crf differ diff --git a/MDK-ARM/4G_test/paini.o b/MDK-ARM/4G_test/paini.o index b178639..d8dcc0c 100644 Binary files a/MDK-ARM/4G_test/paini.o and b/MDK-ARM/4G_test/paini.o differ diff --git a/MDK-ARM/4G_test/save_time.crf b/MDK-ARM/4G_test/save_time.crf index 59076f8..c069092 100644 Binary files a/MDK-ARM/4G_test/save_time.crf and b/MDK-ARM/4G_test/save_time.crf differ diff --git a/MDK-ARM/4G_test/save_time.o b/MDK-ARM/4G_test/save_time.o index d63eca8..d0bc83e 100644 Binary files a/MDK-ARM/4G_test/save_time.o and b/MDK-ARM/4G_test/save_time.o differ diff --git a/MDK-ARM/4G_test/shuiliang.crf b/MDK-ARM/4G_test/shuiliang.crf index 038ffd2..3f372ce 100644 Binary files a/MDK-ARM/4G_test/shuiliang.crf and b/MDK-ARM/4G_test/shuiliang.crf differ diff --git a/MDK-ARM/4G_test/shuiliang.o b/MDK-ARM/4G_test/shuiliang.o index b12338b..af1c45b 100644 Binary files a/MDK-ARM/4G_test/shuiliang.o and b/MDK-ARM/4G_test/shuiliang.o differ diff --git a/MDK-ARM/4G_test/stm32f4xx_it.crf b/MDK-ARM/4G_test/stm32f4xx_it.crf index 55af2de..29ab055 100644 Binary files a/MDK-ARM/4G_test/stm32f4xx_it.crf and b/MDK-ARM/4G_test/stm32f4xx_it.crf differ diff --git a/MDK-ARM/4G_test/stm32f4xx_it.o b/MDK-ARM/4G_test/stm32f4xx_it.o index 192ce55..36ebc6b 100644 Binary files a/MDK-ARM/4G_test/stm32f4xx_it.o and b/MDK-ARM/4G_test/stm32f4xx_it.o differ diff --git a/MDK-ARM/4G_test/wendu.crf b/MDK-ARM/4G_test/wendu.crf index f3ea699..ecfa732 100644 Binary files a/MDK-ARM/4G_test/wendu.crf and b/MDK-ARM/4G_test/wendu.crf differ diff --git a/MDK-ARM/4G_test/wendu.o b/MDK-ARM/4G_test/wendu.o index db36ee1..94fea1b 100644 Binary files a/MDK-ARM/4G_test/wendu.o and b/MDK-ARM/4G_test/wendu.o differ