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

Output:

*** 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/4G_test/4G_test.hex b/MDK-ARM/4G_test/4G_test.hex index ea74b1d..80f0caf 100644 --- a/MDK-ARM/4G_test/4G_test.hex +++ b/MDK-ARM/4G_test/4G_test.hex @@ -1290,16 +1290,16 @@ :10508000222C302C302C300D0A00000041542B51C2 :105090004D544346473D226B656570616C6976658A :1050A000222C302C36300D0A000000003138383305 -:1050B000000000003130312E34362E35322E363796 -:1050C0000000000041542B514D544F50454E3D308F +:1050B000000000003130312E3133332E3134312EA7 +:1050C0003136370041542B514D544F50454E3D30F1 :1050D0002C222573222C25730D0A00006C64686253 :1050E00030383133000000006C646862000000005A -:1050F0004C444D435532303235303132304130300E -:105100003031000041542B514D54434F4E4E3D30F1 +:1050F0004C444D4355323032353035323241303008 +:105100003032000041542B514D54434F4E4E3D30F0 :105110002C222573222C222573222C222573220D6A :105120000A0000002F7365727665722F636F6F2F10 -:105130004C444D43553230323530313230413030CD -:105140003031000041542B514D545355423D302CC9 +:105130004C444D43553230323530353232413030C7 +:105140003032000041542B514D545355423D302CC8 :10515000312C222573222C310D0A000070B5C2B00B :10516000F7480088002875DDF649F7A002F0A0FC9A :10517000FBA1F448FBF769F800286CD07B21F148CB @@ -1451,7 +1451,7 @@ :105A900021461648FEF794FE4FF47A73012214A1B2 :105AA0001248FEF78DFE6420FCF7D0FE70BD0000AA :105AB0006C0800202F6465762F636F6F2F4C444D68 -:105AC00043553230323530313230413030303100B0 +:105AC00043553230323530353232413030303200A9 :105AD00041542B514D545055423D302C302C302CDC :105AE000302C222573220D0A000000003005002012 :105AF0001A00000010B500F07BFD04465C480078F9 diff --git a/MDK-ARM/4G_test/4G_test.htm b/MDK-ARM/4G_test/4G_test.htm index 4dd4887..2741ba0 100644 --- a/MDK-ARM/4G_test/4G_test.htm +++ b/MDK-ARM/4G_test/4G_test.htm @@ -3,7 +3,7 @@ Static Call Graph - [4G_test\4G_test.axf]

Static Call Graph for image 4G_test\4G_test.axf


-

#<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

Maximum Stack Usage = 744 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

@@ -482,11 +482,11 @@ Global Symbols
  • >>   _double_epilogue
    [Called By] @@ -526,9 +526,9 @@ Global Symbols
    [Calls]
    [Called By] @@ -1125,14 +1125,14 @@ Global Symbols
  • >>   HAL_Delay
  • >>   Data_Processing
  • >>   Check_4G_Connection -
  • >>   HAL_I2C_Mem_Write -
  • >>   HAL_I2C_Mem_Read
  • >>   HAL_DMA_Abort
  • >>   I2C_WaitOnTXEFlagUntilTimeout
  • >>   I2C_WaitOnRXNEFlagUntilTimeout
  • >>   I2C_WaitOnMasterAddressFlagUntilTimeout
  • >>   I2C_WaitOnFlagUntilTimeout
  • >>   I2C_WaitOnBTFFlagUntilTimeout +
  • >>   HAL_I2C_Mem_Write +
  • >>   HAL_I2C_Mem_Read
  • >>   UART_WaitOnFlagUntilTimeout @@ -1418,10 +1418,10 @@ Global Symbols

    HAL_UART_IRQHandler (Thumb, 740 bytes, Stack size 40 bytes, stm32f4xx_hal_uart.o(i.HAL_UART_IRQHandler))

    [Stack]

    -
    [Calls]