From c5062ed9a205193d32a7745bb86495ff2bc9a769 Mon Sep 17 00:00:00 2001 From: haochao Date: Fri, 23 May 2025 13:02:12 +0800 Subject: [PATCH] tijiao4 --- Inf/Inf_4G.h | 8 +++--- MDK-ARM/.vscode/uv4.log | 16 +++++------ MDK-ARM/.vscode/uv4.log.lock | 2 +- MDK-ARM/4G_test/4G_test.axf | Bin 1041012 -> 1041024 bytes MDK-ARM/4G_test/4G_test.build_log.htm | 16 +++++------ MDK-ARM/4G_test/4G_test.hex | 14 ++++----- MDK-ARM/4G_test/4G_test.htm | 40 +++++++++++++------------- MDK-ARM/4G_test/4G_test.map | 8 +++--- MDK-ARM/4G_test/4G_test_4G_test.dep | 30 +++++++++---------- MDK-ARM/4G_test/driver.crf | Bin 916176 -> 916176 bytes MDK-ARM/4G_test/driver.o | Bin 1055900 -> 1055904 bytes MDK-ARM/4G_test/electrode.crf | Bin 913871 -> 913871 bytes MDK-ARM/4G_test/electrode.o | Bin 1026052 -> 1026056 bytes MDK-ARM/4G_test/guangshi.crf | Bin 913956 -> 913956 bytes MDK-ARM/4G_test/guangshi.o | Bin 1022564 -> 1022568 bytes MDK-ARM/4G_test/hlw8032.crf | Bin 914782 -> 914782 bytes MDK-ARM/4G_test/hlw8032.o | Bin 1025032 -> 1025036 bytes MDK-ARM/4G_test/inf_4g.crf | Bin 918133 -> 918133 bytes MDK-ARM/4G_test/inf_4g.o | Bin 1047436 -> 1047440 bytes MDK-ARM/4G_test/irrigation.crf | Bin 916588 -> 916588 bytes MDK-ARM/4G_test/irrigation.o | Bin 1046648 -> 1046652 bytes MDK-ARM/4G_test/main.crf | Bin 915575 -> 915575 bytes MDK-ARM/4G_test/main.o | Bin 1030752 -> 1030760 bytes MDK-ARM/4G_test/ozone.crf | Bin 913760 -> 913760 bytes MDK-ARM/4G_test/ozone.o | Bin 1023852 -> 1023856 bytes MDK-ARM/4G_test/paini.crf | Bin 913756 -> 913756 bytes MDK-ARM/4G_test/paini.o | Bin 1020296 -> 1020300 bytes MDK-ARM/4G_test/save_time.crf | Bin 914518 -> 914518 bytes MDK-ARM/4G_test/save_time.o | Bin 1023528 -> 1023532 bytes MDK-ARM/4G_test/shuiliang.crf | Bin 913398 -> 913398 bytes MDK-ARM/4G_test/shuiliang.o | Bin 1017280 -> 1017284 bytes MDK-ARM/4G_test/stm32f4xx_it.crf | Bin 914602 -> 914602 bytes MDK-ARM/4G_test/stm32f4xx_it.o | Bin 1042476 -> 1042484 bytes MDK-ARM/4G_test/wendu.crf | Bin 914131 -> 914131 bytes MDK-ARM/4G_test/wendu.o | Bin 1025196 -> 1025200 bytes 35 files changed, 67 insertions(+), 67 deletions(-) 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 558030ae49167830ca6495d9f97b0e4bc944985a..a5606c30edfa9e0d98bb9c05f935ee1a0a2335a4 100644 GIT binary patch delta 633 zcmYL^Ur19?9LMju=S;V$=hQ>_P^ip@5rN#ZJDo-#Vo`%36D1^xbZvV{8u{QuMHp=E zL6BVpb;hOn@Zrbz{Jy{6?|X{r_R+ca zyT>cGw}_%_CmoCaDyr*E)J>acizl(~_gI@IdK>ha2}TV2M96fC_wk^7B;yzHpR3iokb%?CY={+~N}jKLA<2 zRh&VxM1PC`FvNfTtW?1QhksUdFcn|ZfJ7B*8obzRD~DulF?gyRgx!q6z5}%$gU-7D z`5g+V^LBQ6&s_GM?K;gk;3#1G0kDAT>`#9}@#1>eAe1*E3Br&=R>3 zxfWu;zyQhCK{a>QxLu3}|~wdJJkG`o}|wf_K&N9!>F delta 645 zcmYL{Ur19?9LMi(=WM#I?s+l_Ey^1#dKmXE-MvOI%p`@94J1YeF?Y43qVU1$A+c!s z5LmeAjGhX_=+DFCQ0Jwmm|-$p#Y7BiZq-9z53zw*7M;1P9{BJ*-ygqoe&2`R&{Uw5 z3f!x6WOGC+yjkJSAu%A=2M$hRn_ADkg;jlKq%(ia;R%GY+I99 zoOK|0%?htl3Y=k2K6L?P8Co2(!!&!42OG4p#McV|OALSCfuY1|fAqWH8XGMJ0n#j2 z8plFzuMPm5XMcWI*&xNx-?>AO7+Fw3VB-raI^F50grrAe=+56K+HhM_i8{K-cokFjocTOKAz2Jy^OvLA4drd!pi=Ol}5ktkgX zlK1@LBuOG(`;r_095I@#o*GUDWn`NEO61UouaqkRK02>j_ zsw!!+h;gr}t$&r_A3uOutput: *** 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]
    • >>   Data_Processing +
    • >>   __kernel_poly +
    • >>   __mathlib_dbl_infnan
    • >>   __aeabi_drsub
    • >>   __aeabi_dsub
    • >>   Print_Temperature -
    • >>   __kernel_poly -
    • >>   __mathlib_dbl_infnan
    • >>   _fp_digits
    • >>   __hardfp_log
    @@ -526,9 +526,9 @@ Global Symbols
    [Calls]
    • >>   _double_round

    [Called By]
    • >>   Data_Processing -
    • >>   Print_Temperature
    • >>   __mathlib_dbl_invalid
    • >>   __mathlib_dbl_divzero +
    • >>   Print_Temperature
    • >>   _fp_digits
    • >>   __hardfp_log
    @@ -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]

    • Max Depth = 112
    • Call Chain = HAL_UART_IRQHandler ⇒ UART_Receive_IT ⇒ HAL_UARTEx_RxEventCallback ⇒ HAL_UARTEx_ReceiveToIdle_IT ⇒ UART_Start_Receive_IT
    -
    [Calls]
    • >>   HAL_UARTEx_RxEventCallback -
    • >>   HAL_UART_ErrorCallback -
    • >>   HAL_DMA_Abort +
      [Calls]
      • >>   HAL_DMA_Abort
      • >>   HAL_DMA_Abort_IT +
      • >>   HAL_UARTEx_RxEventCallback +
      • >>   HAL_UART_ErrorCallback
      • >>   UART_Transmit_IT
      • >>   UART_Receive_IT
      • >>   UART_EndTransmit_IT @@ -2296,16 +2296,16 @@ Global Symbols

        __hardfp_log (Thumb, 872 bytes, Stack size 88 bytes, log.o(i.__hardfp_log))

        [Stack]

        • Max Depth = 200
        • Call Chain = __hardfp_log ⇒ __kernel_poly ⇒ __aeabi_dmul ⇒ _double_epilogue ⇒ _double_round
        -
        [Calls]
        • >>   __aeabi_drsub -
        • >>   __aeabi_dmul -
        • >>   __aeabi_dsub -
        • >>   __aeabi_ddiv -
        • >>   __aeabi_dadd -
        • >>   __set_errno +
          [Calls]
          • >>   __set_errno
          • >>   __kernel_poly
          • >>   __mathlib_dbl_invalid
          • >>   __mathlib_dbl_infnan
          • >>   __mathlib_dbl_divzero +
          • >>   __aeabi_drsub +
          • >>   __aeabi_dmul +
          • >>   __aeabi_dsub +
          • >>   __aeabi_ddiv +
          • >>   __aeabi_dadd
          • >>   __aeabi_i2d
          • >>   __aeabi_cdcmpeq
          @@ -2496,10 +2496,10 @@ Local Symbols

        [Calls]
        • >>   HAL_GetTick
        -
        [Called By]
        • >>   HAL_I2C_Mem_Write -
        • >>   HAL_I2C_Mem_Read -
        • >>   I2C_RequestMemoryWrite +
          [Called By]
          • >>   I2C_RequestMemoryWrite
          • >>   I2C_RequestMemoryRead +
          • >>   HAL_I2C_Mem_Write +
          • >>   HAL_I2C_Mem_Read

          I2C_WaitOnMasterAddressFlagUntilTimeout (Thumb, 250 bytes, Stack size 24 bytes, stm32f4xx_hal_i2c.o(i.I2C_WaitOnMasterAddressFlagUntilTimeout)) @@ -2525,9 +2525,9 @@ Local Symbols
          [Calls]

          • >>   HAL_GetTick
          • >>   I2C_IsAcknowledgeFailed
          -
          [Called By]
          • >>   HAL_I2C_Mem_Write -
          • >>   I2C_RequestMemoryWrite +
            [Called By]
            • >>   I2C_RequestMemoryWrite
            • >>   I2C_RequestMemoryRead +
            • >>   HAL_I2C_Mem_Write

            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 4f33a04a3a122e37066ba1f3e655e71eefde77df..5e423b792362f08f3613aac017bcb876571c8752 100644 GIT binary patch delta 93 zcmccc)%?O&^9_DnTiftU%1nSq!Eh*^P{4T#x+ Wm;;D8ftU-3xq+BxyCM(o`gZ`3=^79K delta 93 zcmccc)%?O&^9_DnT*r5IA7oiftU%1nSq!Eh*^P{4T#x+ Wm;;D8ftU-3xq+BxyCM(o`gZ`27a9-% diff --git a/MDK-ARM/4G_test/driver.o b/MDK-ARM/4G_test/driver.o index 0a56b43d3983c50e53ecb0f80f0b98c4a2317177..7eef6e6fb3004a194aa671244be26fb11d48d476 100644 GIT binary patch delta 3517 zcmZ|ReQZ-z6aetswUrIpcL!8K*9Dk`5wqc1IvBH^L#G1Sj2}ZlyHsL{L)HMgL}H5g zF~4G$%&_K&bO>=sOuDFXW)iocaew$nm#EniFrA7S37XC?IzC1#p7T!YyNUA0&3W(s z?zyME_xAP0Pc|Ms+1Rtx^uou>&iS35rJfp3ZG|w2V6b&#%RRy1(hB$LdT(8QjpyZx zhSw?@OxTLBnXy^0S+U)KZ4S0#Y$e#{Vw;D}hRr@y(V)%rmAF^0Ugh?>SGl1)rPUYL zdOYiEYHB$vG9=^Q#8l?UeiPxTW!-XGWIV$MN1FggAn0xdZrLT(q23nQenysA zFJsr+JV(zZO?<|4Y`Cn64LnEB6;15sIg&U>k(h-aF3J^F$E+q^;KW|M?9vm97GH&i zw5+sbHL;D8dM{z&eRy9eyqyb2u`AB`D|4Fohzp;_%K#VlUem-8o+EG>7kM1Qm+?!V z$8IO*S%efFoVN!rNA*QEdBJ`~R@z%l^52r1^^)dxlY|3jYeN!&7h zQ@v&>TwE`G1?z2v9L{5H$8MWm&)jL2`nFg{vF|e;8lAI7h((_P;UMpq7FI+9){T6$&mGpil)9 z6nv1Q&;-k`Vd#ez4EAxa6vg=?yA<5lWEocLBeB&QQo-VYX-aL1-B^m>BIYlxvqrQRQnO=5ps>Ay|yPe8Q^VOW7G9g?u0Af>=69nvsHkX4{Y z2OE?ZAvo6qClMvQD`HGD^RaP0tN_%74Yeh zgd9Oifd(DY&|*QzD$vLaZG%1%*IFq~=NI=bmMlz@G}TG5AumlVQSe()#ud4j#R=Uc zp>;;i29^X&l4KOw#DYil29&OPBd3`Kw}r%chavZ~gkX#$p~wR)87QBF;`13f53zJX zm?Wu4D~kh0NCJK%=Mk2Euot7)8lNTQ1L zvEZJN#1(m$1@}avBosNuf_p+TtjK#TxF;k@MUJ!Jo|K}b6gk0ydqR>{>_)lf#H;k{ijs-?YZ1+jAGC$kbEVw@lP<$vK z;Ts9Pm5lLhX=o#HY&7=%I~IInA@QOVKHK*!&5$DrDe^N*1X>oNOrh+{e}Z3G0?QH0GWQdmVWCd@xDkdf1Q!EODsD zKPdYkN=?4%EiAYvBw3W6yi~A6VT`1|)mX*bSdvhF6N+Usu2m7QqKCx>VUocu#&@VM z7U|EsX_CmJ#%%4J(+mEaQASY;F9>0lBy^Kx6nVN(XOhJ6 zn33}=ixaAELGdXPVQGT>BwdQU$bx%9GOEa{EVw6SR3~86d9zR_OyX0dr%-2vB%(-+ ar3>s%T-bi7rSLkmVX#h}l;R!zo$w#YA&BSz delta 2321 zcmZ|QUr1Y590%}wtENe{_a?1t<7#Q5LiJ%?V%w3ptt1Zv0~<7~W4f0lr4Kq8 zZBPIsPwZ_Vm*20H`MKp+sr z`8BKO*}GrXtmDt#Ro1LS&ZKD=HOBkq_3Wz$=UQ)BZ6_R|P~g-nC*g0fyRQFO>z+fs z{p))NqKQtfn0WW2bDfFKQ<=;0^K%zd_7$t~{}YK1F`Tv!!+pti%^e%CUw`pM$L7BH z)IRotdGo5>JhyhuzEc03PyhbXq-{N?KX>Ij``fqoOq#e+wOi|MS;hquKd#y>W*^db z?c?TcOo_`V63588Wq1wTxXBBq;kn1wI$I?JmhQaIPojCmZrWw&8m z?Q1BI{g1aTqtP&o8{DQ3@X1a4h{OHRGKO|nA4Bi~S8se|8MV8sdoj!wER(vn zCzdh0^TfZyU*$vqF|mX+aom1t8O^(E8YrrD(Xfr*44nDHZiQ!?m!3sfTtJG{T{Ugv zOB}t!=gq4fz^XV0^C54(P-7bn27X@Q&2cu&1q_M|vSJ8}q74;-@HsPQslN5u^n3 zi7N7<2dg3p(?$BwAqEf^84QXcWW@*;#TY7L5>5NaG@>Gheld%2F^_^+z=kNnRZo@> z6f5Wz>lhZBm=R?x3+|sVc*GJXV#1BI@M22%P!#Rh5&?MjlMup!`9wEH#aZM9^9km& z2=fW%6U--=PcWZgKEZr8VLripg82mV3FZ^b=O)Z2m`^aDU_QZo!ijC+gWp4Ph=~QH zMK`7d4;kUamSDaEg!#lKQo@Z<;YD8Xd=cF+50WH0LJ diff --git a/MDK-ARM/4G_test/electrode.o b/MDK-ARM/4G_test/electrode.o index 1a15c852d8614a3964177c0007af55d30494c3b7..4a53a9ef55ba1988ef8c4f21dc7ddc71eea7003c 100644 GIT binary patch delta 2299 zcmZ|PUu;uV90%}op@jmy=L}X5p~C?~ATnIL4a&j@3k)H4I<*gAwsa384BX<-&0y>T ziv`gz8PM?qX>pUGKCr+hSRS^77)X$8Vdw}k877)(Fham&52#z>_w0AC?E^fV{7&!Z z{{Gz4-bM%49UNTOnr+l~FYL+m`m_Cc{=!AV5aDoWOIc|+oW01GUsMn%@&!J8nEBDe zOap5Y)?_RPmJ@3V)>JGP)-w%u~1J6M%MCsb`Z{ma79#Rcg&u zuH^dx_1x2MsVY*=LeamEvRBwu}9WjrZ2iROD(8gcsTQ?=N+uSbe%YCeGN$Tw0% zsN_9tt1d~=N;7wtUMTLC!F?gA+N8LHAJCQM5dS%lkObJt#$#^IEZWa9-?|6x%qj`WPPd5kA|G+RnWl zKS<%_8rj&^lA+HHyQ_R!3oA)Vg#wF4M*g-gX6buev^FoMhrI%Kqg-p zmUOd5%_jG8%yN;kj;p0cEtTppOm#Xqs7;3g>eC@Yzv<9PCL#1vp$_+{62TmOEJdEx z#!V%JHaXO#WyRkqkt`K7u2ZXN$q9r8Dnl@%xX*s7S>!u`3NcD(=}Z$3%SC#ihp-jK?7R6b5c`3=4wI8ItvLwmRWtq?LKu7 zBT8*L#Hml;*NOY=d8SgwS-eeG$@~)14_R+jaI?6nQj6!A)cMY22~wAq5X7!FhoynW jwM5cnK1-a+zQQ1#)Tl!*C3Kih*ASe4>`-F=#NYORZq8sb delta 1584 zcmZ|NUrbw790%}ox5B6!_fRnr6kQ80j2Q9Wj$y%MSu>|?GEM79EXlOg@GuMykYFsD zX&aXa(P=BXZ&9|j{u?Adti)JId>Fzpuv&ADRx6z;XOxHHpZm;D%+^7r{jdleeKOT*`8|_1#c1NeT{nho_*Vbzd z$u7xmi9=E$sg&%IR7sqY+a!A>`y|zc^;$D~p|Y*L^{}@UnY`IqWqU2ZWmz_U%A1k@ zR-Myk^F9Ce(Q~+ zT^R!}zo?rkrcKpr;M)P+Xq4c8OE(**&_{kpTBuZ?o2pLXVq7<&%tAy8^9nbHy{Y)EXe zj1o8UaK?@l`m?SVvQpk}k7RVKBlB=j67mDzc68gv%(jU!cXM>$STrAVU~nYCJ{J465_B)0^KBoB-z3gQCK2% z*d_sZJ{Cd~NxOmLkK4X7X3CtJ5A)h-5NrrksZ1;fmYBN-7RA0TlPozYf(*VpoIqI|gA^?vu> zyZ>GP?P8>UDN;XJqzqozrV(aak66{T_^>h1>7+aMHd zS=h3%X|QRrZNRn>n+{tJwoTad*mAKMq78z7G?HVjtgNuwtrb>Cyw7WNyKS}xi^XDt z`$N20{q$~#m#Uw>4)M)7>`8^OZ1%Wv+S0f=nib}clxd!7wcDcyzUNn}?{vCtn8$sz zt@_Bp&W`G5p1m)6Z=Tr2P5%XV8~ApJEznUYa-zN4MA!O@?vC!Uh{APz$S%xLf4%6` z|6lb@4-2tQpzl!(+}A9A-ldFywOef0E`>Nd43}QUq2mM2y1>_l!^v};4Z?z35S zRXd4OIyiI$BWK1r+YdL7;`$;m^kCXwKIQBjGLOVX^>>`EkoaAgTJz&QdoIOVmc>Op&;0;(g zjwM%d`c;bS{E{<2#r=Up4aLR3;_M*Bjr9tnp?ONJ9iZACoEo7Vx@peNQ;v%`Y@r;c zZ#a90a(GT)?Fe{JVC@)Anb9|?h=@nQj79ZD%)Ko5hx!(iKFaK$rcg^cv0|s ze^z#5FfF?f{3g2y6r94S@m2Ntia|MryNf})l&K6Up?q^NA!QjQKUJxML<5G`Q3AiK zvWH|0TvEzz<99NfUXXgKvj|}+%YSmVGnMT@5)&k(nE%4-!WT-uRC_7g6gUS_R^#ff zog{G>m10V$J9vzw3|6ExW{8WV1?q-SVkqe|Z6&FN0Vz#?<13%qTRTY*=B3P`q|e|5 zl4U4=110beXC0{+FG(D{QpU7mtxgY#8K$LZHmWi}(gg*lQGzIzRJJoDct29EqYS2G zl*9uQQv5oxcA{rVLSP7@ETZVL=tRRL%ixj{)Qh#}`7j+5PR5|5-++(PF$pP}Tva|H z$pz;bl-dl5ku<`nloph#)UK!Kwu7)DWdtRCqO%kefx0(k9fMluyL6oaDP&uGU$im?`i|iKC>SbcI9%(^ATWD!0;g3WjB!47p9x1np8f zGbB#Z1rsRv`|y+OVqkbnR?S$q0d5ZC8>j)76o*l*swZiJFpA=VtFrS$LUzYs$J_Yp Mrhh`P?&J^Wzn~LPQUCw| delta 1456 zcmZ|MUuauZ90%}oyQWR;dQPIEEq1eMD{b5#lWf(bXlVo?6@&)+(7qU=Dh_)+^acifuUrnAD?wvP z8YIUgjS`!rNzyE_OIjpPNLnSwC2hr^(cj-{I{)(70pHmhIX!6i`aD68$K%E8IX(Vx z^<7T)JzSM@`k7)ar{kxaFAN0UJ9ADgI_-hQe;XXdY(;+(crqCA$tIDvKOXZ%eCKB_ zh2JfndCI(~pZWj=jOpFU-tFAjRl$;b3zzv(O{hs>qcM;)x+G)6zF zcxl|&PBko9xbuPOvE{V7U_nosZYzYj%cjq|hgC9$vd|REYt^ps$CT-T>oXaYWU!@h zGA?f+Ngi61T3g*?2ZjtL_F zoGf9LETc?Ta7glSeJQMCgp@E%wvZt^*d#UV5e4U0LJ|S8j40{HJlREo)KDP~SSg_$ zZnA|i*~cuYBTF3ECjB@d!{|s0;|P)x;>3?M8N~)kp-Ohp^0iQdmn1Pk>X;+TSS9T! z6NN)E1J|OE!U&Q3k>8LZF>I0q_Q(pH-w3-1kQ$;Sg?X}q!ckW_>a1^NsNg1cgoz)s zWEfd8j%|{{0a-%F4Iz&pQHT>e(xe|7#Dgjcp#{PUyd;kavV}QP$0|`MlYSf$4_r$^ x2qR<^)8s>B$P6~gI`&8j&Wun;fG9*s2=inV1rkGrBw*bXF2YTk5x!}j{SP|w&LjW; diff --git a/MDK-ARM/4G_test/hlw8032.crf b/MDK-ARM/4G_test/hlw8032.crf index 9350ad3a8441f5e026de3498dd3092510ce658e7..9fbebbdfef6464b1fe0c8e290050c9ce9057d1b0 100644 GIT binary patch delta 92 zcmccj%KY9d^9`4|xZ1z&I>^QV1T!Yz<(iDdZLZ>Oui|C|VkRJF24WT-9PAJYH; delta 92 zcmccj%KY9d^9`4|xQ_4aKFG!Z1cxWz<(iDdZLZ>Oui|C|VkRJF24WT-3*AJYH; diff --git a/MDK-ARM/4G_test/hlw8032.o b/MDK-ARM/4G_test/hlw8032.o index fc8e410afd0021ac281ad88487940c255aeb0d84..a79a6bc719a727a64a0cc85cfbc8bec05e2fbc89 100644 GIT binary patch delta 1689 zcmZ|OQAk^N6bA7BO^wD{|5w-ADU>ZrsS2(nF=a-EGpqxBXsIAu+)E;ZPFrLAzUGmaPrdz-8|0ZM`%?gy%nuW=~ z>&z#`&uB?Xi}(5GhTbr(xY=sjl0B_vu;^I>{%JRj=MG5P-!<=5TW%OQecr4xx{&?E ztj=G#snwu??=DEx0`I40wXu$F@(2;Zdf=8;(XmM0LG)fUON#;LRaY*xk4icS z=cuHkk`Ct5z_!J^!H{76EB*9&jej8LtTM{{qSbV6PRTWy z9!BLgN$>os)sfw_Upo7k)val@n9I@^q%(sBNsSV06FW-Bq$l;8R;gT1?iu!?Q&Qt7 zMu-~;_MH4(tKq$#6&O)DcptT75p4ouQ8N#NQS+#A4sqt?SSCSaNg5TO3-YfbL3EQ4 zB4ieGB!w;V5QXDH22R1E{>3}v<}q1%h^ZYj#DP`PjK{=>N(fzOB{B37J0?jD7Kj7e zqyeQ9LNh$11)U^-5fVf~uqXq6OvnYxVN6OILoM;4jRY`2h7l)WER$wrNf#=<5PIPy z!{{b4L`VvAB#kZ7fWqs-ESzKs9Ynql(t;Thz^Y(T`|;$uEYpk18&V_VU;GajpC{M= delta 2251 zcmZ{kZA_C_6vyv_t)S9-s}yvzXs2wr1YBE-Q3Qkpvzb65S@)LIHEzVP1)^p(`k^E) zve{^nS3OKy1csX*AhQcwSpthpwlo{vB*Tp?z9xR~LrFAo%MxMR|MoszNj5*6ob#OD zdAs-AHW;f2#46ft+Lg#NzFe!r=CnIYHZYBOz3$z$yS!f82FI3C$M#a^*5i@f6OmjE zk^xx)F+hxvrI1WW7GxP@Ib;PS8)Aw^a`|^Bmb$iXE^%(AV_{yJ<#5`o>~_0@z6tZ! z(_b5Ud13miu9xRU8+y5|Ds$hq?XKc2j8?Xpws+mhG)HG|^H(cYRe7DL;(hsu+v#<> zj{54}idL=@hq>jy!22#uydYLb?-Yq8Pv+~Rc{_yd2|Th>Sfl%Qi(@PPukoL5p*zL&Fla(n?&qw%tHY2(o>RiC%}~=RQE0pm zuZ{KvMS)>}vu@h=9zsJfeaS4%Os1eHG#wq}%*+_e(HLtb#{sd{7=R0<4}7TScLEkPb^VOJOME{m(gjiTV$S9GZV$ ztTcSdS&y1426H5Ngrd_pf}hGyBfdS#*&0>)63j}fJC4)9iqXS>*r;8mn+P+_j;4nS ztDzEbWzqB@9O2Pb&i1IGs;RjRWi8)x_8CP^2n&t33876=T)JoBZdctJe&Fnynrz#Y zoMGZaG>&t&KRIJdyD*zZ@tL}cPKulqRvBSMmR$t>Rq|)xdyqvsl!!&0ewWtIwAj}l}IobSh+JL_cu{LV$LahB)ybkIQpe(F_3XQ>h zkSuHMM(8LNcO&%5EN6ps_aK(rDBbncEZq&aI2%&#G3mBY9B$1=ze_bm`DdW2X_r(! zYJxKPA9H5cAK7xMJ0sR=Lo_bQ$Rd)h$UQQhMQVadpfctk)0=0-bEfS1^s6>g)mfCV z(y$CHqU%zX(E^moE#vU=8*Dg+yjCn@4dN8;}6D*)7m8hf;6@P>zw^97t zs5DisS(27TWTzrQic30ou14jwP?IE~MZ~Sh2#rfJ1=65b z^C;pX(|M4gtaP<{MJ8#lB!*>zRq8p7id56EBp#4Ho%oU@V}2R^bsm?{xLmMHMzs~c zO0rOG2uVS+VE6T;7Dap%mL#zn(5wMt^m5p0{@ z2aj653pd@A#FLBJbb@y+iGhlHWlml?XGC4Lo0=u@fTS+_D@A-1m&6Z}dg@;*GDP_o zKt>kjTvdIhs7aCpNR~c9EH(AGBt@&!B(4Y+)CW=nlIn9^_3_hQNm@Ym=+%BxWQK+% zxdD=z`gW?%f+X&z(tYkJ;-T7p5Ff}Uy;?$53sG2-L6B6nhl-5RoFtPVHa+JLMeb4g z07wEPwS~uu6i_P&etcg@<)fQ2&i{0}f{`W$uoL`fK1RSGy&}~ZHA|JCi&EkL9?H1m L9l?&vzp;M+N~m}c diff --git a/MDK-ARM/4G_test/inf_4g.crf b/MDK-ARM/4G_test/inf_4g.crf index 190e609bf1c4e7a8c157678c2a7ee5cf80e331c7..d3889c17077104168927b3216817d73fab08be31 100644 GIT binary patch delta 91 zcmey`V)3=bVuBJ^``29u*%*MpZllg`E(CW*vmtl8AvYrsGXXI(5VHU=D-g2*F*^`* U05K;Ja{)0(EzfpCZeEw~05qK$M*si- delta 91 zcmey`V)3=bVuBLa@txfV*%*KzbED30E(G^*vmtl8AvYrsGXXI(5VHU=D-g2*F*^`* U05K;Ja{)0(EzfpCZeEw~05Z!NM*si- diff --git a/MDK-ARM/4G_test/inf_4g.o b/MDK-ARM/4G_test/inf_4g.o index 81f127b37d0e29bb57bfafea692d70f3b96b9848..4b9615326082b9748063e6b790cd97dad84b0c26 100644 GIT binary patch delta 2304 zcmZ|QZ%kWN6aeu1pk+nYULs;(8~>cFEDNkHFlqq@GNc2F6>xTm1YC3>5hBJI8x2{b zF(Xkj60#f;N5n)Ui6NFuQ$DN#W85$f$37VF0}%rZRB%Pz_!p+Pb3^vkR?GEcilg_q>rrEY(`9qKTkX17?NTseFk&$b7)FdZjC~j;jChQPFcL8K zW0*tLE=%QT{O(i0>r7iRm$V=uux}=BtK9z%| z$`vS|lZTCgO^bL5UK^2zAUrDf8Rxew;t&jfgCw>sq6UV)lu2-NP9`d~Ff%8u#uxB* zBiz1@6~Ud4ACKZk!vl-((mYAfHjl-P&^b@V|5(H)kaZJpU&Grm!U#Xi%OggEQHm>k zfByoO4?x<2v?^s#NvQ|gDNVvWE!6>cx$4AW4$ zgtDZQgDmUNO=2q4#-y>Nzzj)_PBK`Wkozl&TPIm8KIkNA)yZKNKTMEx=_H%i&q6aTKIYeyG}yxA1Kp0sbiUiPLd^^cv&JaL9(us z`W=Z8#gKki9xb8SuRD6I@=p8EwD|}iV{@6ByUBJ$g_%4R-rxh1r|5-leC~jpY0-x zA67_ubaIJh5K8|4I*O0hBUTK4O`L8IsIOtyPK7Cax4oH{9bRJp}60%4L#l<1C5v8;pn z9*XT5+_xA$g`ZiR&_pu(thS!T=$N6MG45ev(0y z=nMIPPkRmH^D4D1BgD-%dd z)+Y7Qi8I=#iNvpy(rBL{k^!AO#WD!nD8>lN1gw6CKV&6a_=6P&&lcYPJ}5=^&Tr(u Dv*wS` delta 1613 zcmaLXZD?Cn7zgls+w>(i&9M^Qs@+(&x>Bt3rp9fFl~S6$q*h&KWDOK*G?Nttsf0nH zV*~?IjM$RGf5CtjyAQ>Fu&fXwg&7ErLX}neB~m|>#h1=>TFtDfL45w!)ekx^{Q2d% z=Wxz>a&I!W*%{mH9NVY+XYKD*);SL!dZPW%;Uk)+#jjN!sdcm)U4~&e;?<_3JH?gb zrrYM7D*ln_;Vb8?pFN^G;*Yr>sB*a6hU?89_gg(~T~Z;bl$az{l4?nfq*h{<+#{)z zSS0nS9=G+_)#~k2;8Mxz-q{9Um8^aLRPHTn%bq)@+pp<+z1`hj&p_|7XHWP~?rS$R zQ|jWD^@F;av+c&qk3O!&?Pp!7foe5#`o8mL+NGs|H_kkF&VRx?{F3u%YEM9Ye*b?A zz<5>dPwjnOJ!!qmXd{gCsus^&P&KLe1-1Ks=3P`(c>irx1DR*QkTSI^rn>8F|31*b zE6DVzPJ9|rM(S&*ckA!E{a8|#eetqv|KVjd`BcRv9baVCfvPR57Si#@b#(yaH&jbS zxr|S4sDt`RtV*f(!I4+HFm_eltIzOri>@I+P9Z}2FfCM+P53ge4&r)VnNZHFW<3e} zH!|Js z7$QwbkT5daH`j;>4L=ASaFHm2q=-?{hFLO!9I-(!2>oa!A^6B^7$#v%k`XMBC^kq8 zjq5@ZU1SP_WCr784rwxvRg#7Imaqs1Sw?`YAVTt(CIu{!B1%Gi*{!r%`F%gFYufWz zUsn%FBiixSDgUKCc~ zCDI>hMuN;CLl&_{ifFhkw82H32$B_yk|Jie$8y_a`mb`c7p=q(ABkd^#4t&wus~L@ zLGozaR4vx>X{DX|`+Kj^acf;YD2oirkSsDz!bp=5tda?se-rX>kOBh4ga~QFG;v~y zNVCKbdr1hxOGYq6=8+&-WQ2?Y;Tj&ilEYBX;9-)N#_Y$!&K#-P@~`p?tnQZEw8h^VzFi4W7m(kJJ5m#`8tS zV@MQ96ibvySR_g%9+R+2*d!j8SR=7kqAZs2m@gc&xf&X_xf)&DT-ZEsdaT>sZm-kn zbi+4qc05>pKX2APSlygA*V~leP^wtHYaE*ltdCWnH7DE_m)qIsjGZ;~Hzl!8N_BeI z6R$fPq@Az(K*NFk9j|sBIOvWYdRs@#b^kB;4#C^4Hz4QJw%AJ_>dzj%>8aTD9&LX_ zJ$_hkioJY9f4t`5U-JH2x&?ZVem=JSOFdfl@J)`dq=_Y>Z|x{LVPM;wuCbgo)qVpX zoYK|CL3l6dT4No$$s9sLar&Hzjc4@J7WIRvj^oqwdP|9XI*gCb=o-TcS4#Hwppy(D zC|FMXXsQ>S3i@LTnecn{oHTZ5;*Pxe)rpu;ET5#x$9KwpYq>L$K z$s8&!O2@rf*-+@X6wA?UNYvG7PXqSwUM?YDM zG1iaXGSy(AVL4V7(tT4 z1S!V?X~ilTfn!-npp7KaOHzoCG~#3#S&~CVR>-4SC{vAESykbbuVBYzIi(fD+)$1v zsl+0&!?-Hcp`OSOOPbJ6S};ahF-vx1g><0mn&5|*1kg=-5F&k;CIiTjA=s`9BXE&0 zI>{)4WE>M@1`8yGRpN)^hR}yLp-jD~)zp9Y`3Ux1l?kR0;f5K+iOfx8?wi6Wnn?m( zB#B|NjHpngcHrVo`G;1*xFuO9>PZ;wq#XUE4r3&MSu&0lGJ~p|Aj1;*VM!lCB!_8| zLWb;yZAA#cMPyhqi6Cjg1nIy68Ne!;g5$O@gEkUCFBw3DOd(#VWl0JZe+p?dlS*_E zJBCRMqNEjz#1G?+(1&_5f_5^4ev-f#Nn@7Su|n!l^_S2GFBw2L8ApgrVwxn7AxYTo z3OTq)9-X8KK_c^!J}eNKk0ju@CnV8Ea_A*_M2I}3#EvYHH&I@A2hBuY#d*EqALX9d AVgLXD delta 2907 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 diff --git a/MDK-ARM/4G_test/ozone.crf b/MDK-ARM/4G_test/ozone.crf index 3f81d0e1672cee69a1401e3eb1b624c5704c33fb..2c69966f8428f64734c2d6e431c85ca8797816ac 100644 GIT binary patch delta 93 zcmaFx$o#=0^9@B@T{6W_q?9> z^E{u==RV(u*EUaH+uW3CjP$H(bESDQJ#Np2)xr>gfPaUtI1tEOowt5de!(WU=lGbb zZp>xC7Qhz5Y%n`)5$p+=1C|6^3`>SNVPE({iwMQeVM$r&U~TsXWsiEd zs6)x~l#gC7QO^I>p4$oON{>q(M2^iDuu!)lrpYTM2GJn+{A55 zzn0?Otj3=6jT8m5;~GIKY*5+e(5-m825vWr(0P{D-DUCtsx*o%|KTt<q4hBawVASRO`%58#llwQ?tijKmW zwm+qCSrwL0SraOx(4Zz+31k_Qd`dq9={73X&QFzaW(avltO`%k%V$twl=?OC{)L;i z$OG@(fdq#o}?zm)J_l#Xf=1c}YIi#63Ws7Z4I2{37=^m8BsAmvuIy-aeb zQj=Dp=BgcF(ntN8OoJ3zns=CZ$s`cJp~R;aImQHcqDgRp5^Z)qojN8?>d>Utp~SeQ zIn5+QGn$Mh#U~&p)8so3lCwBYE;HFi5ltQ>kk6PrqzO$@lGWV*rHe@k6)<=i68=?rDIf}d@tHL6xiOjyU2~BdA ys=3#l%%qA6FM(8pWLg>*lNJht;N$eAc6~Ig-2<{;h8w3`IQ#B0g)grDbp8h;VN&1# delta 1542 zcmZ|KUuauZ90%}ox28+nde5zFlAw;XowW7Oc5jwxQ)D#E;lk`lutGc3q%t8H8#E%= z!X8prn4MY^JN>rqUkX07FC~#dT9MK|h%G3#dyrQ8&_F8|`p|+x`=b87RN2Gag)g7n z@9*T?b2g_=ZcLrb`ijS$uXT<$JE3MfbalN=?Bvqv~%Y62BW$?wLCjv*|9XFfZPQVV^w(a2jxY_>T z?b~s){^|c_a)!f^Q>P-Y#9upo?$x$4axhg<`g`2G`rN*EotJ_y99J-|SA_-(hE=-% zt2xztC>#&SuJPADXbZ#x!S45C@5C?K_~on)mwr2>kC~4@ya46%+E;2hqCb4(6jp(I$!QHoiGw=c^-@+eAW%wmZw z!|2!bdsnASoK5Lxj38q2Zd9O$+{1|An*H8XSyWxtbw)e3*fjiLswTX}CV}vES-OZ6 z*+5Qk_05@T0<9^Tzl<^meeirN`~gR(bpL3oTMBo&<%GRbxY~X))tkE;7O=pTQS6Wl zsQEaO_h-wUXcx}Kb3wJA#wwqg6r%1raG{Dg93^i zRA7nRgE1g{henb>Oh9x%SK!KkK4K`0u+L(SOk;~E_&yW-2$LqHND?{Hg-Mb}nT*1d z6&B%;6?BkI^b&0V5F%c55*z&_fg(v_iDY5i7KYGB3W$*j z^pHi2kQK}kKek8%e0PK{gh@A2WC%Hu$0V6Rnasm;S6GE3c;D#Ms!u(5jDLUr18oTJ ADF6Tf diff --git a/MDK-ARM/4G_test/paini.crf b/MDK-ARM/4G_test/paini.crf index bd1237c6ed74d3e29ede766f91f888c4b9532b68..a8192ea5ecdc5155e4dbae4f2ba76df0b0fbb36b 100644 GIT binary patch delta 109 zcmccf$o$SD^9@B@TOoJO?(N;@_PY1E@!55~-`eN#_+2iS2Y+1G z$NqhK{)XP=_@^gpI0Auq%U$}f9`Ih5z=>R_#ZMhc4|NxZJ2q)u;xY{GoJhZ zBd$KfoV$C#__(3_Kc6*pPGwTU-T>nd8CXhoWh0#?Y+C<&J8H@dQKZ}}kH@xR|3 zCoaSV%iy=VYE-!MqFh;I{R%4ND4b`7F$72zlR}+Z#|LMPN3{&{tVXd#=FxIaScQ)i zFhQzF5)-n-iw!aWEg=k}n}je*qL?DnSS0gUBUO~i5Zc}rhT$hcL`Vo}62l5fp+s6? zdq?Pjn=E6TL=h)3ERhU~lH}~6*3QJN?1jJ$R|whVS(6@C!N?L18BJ@q~Ig-m>|nYlH16Vb!-qX zwD*Jobdw-PNdi+Og+;QAHF6tevW~X*g-!TL6%k@Wnharu45LI6u+0f6xXC)k$tL2Y ZiX~z~k=RioUO3aj!w8TIm`ocF`~@7U%EbTx delta 2085 zcmZ{kUrgIo6vyum`oqH7d&^`=mr+tSHi!|@cK<4og=LVHWHq3u%+Pc!E;eywXr>Zr zxAJeRO0^`K!vhSGxq)*;=F5+Vq0DUBsVo>=#)BmAV6qr-Te4_pL_N3X_oFeqX|=n6DHs4uWuaxGnb1_U9JD9U%xJl2GH(N#1kOVeuq1cL}MSiZv8X=rH{ThuTv znL!C+Wsk;LJ@g;J{GVYQ^VLtMIQs&YPKp9p4hx|)!iroDeI2waIQ=2z!!7_A#PwzO$Ct&2uKoom^rJRMz?WE2G$TSkr7yt zr2bFN%Jgp4(9nw$w1fXFk|+{mwpywgfFVgH)(}6DBrHp^h$N(Udy$9_s$xi{|H^a= z5SfR#B=!`3w0g}kB2BO$NgI+8owO3MLHT<~qK`NmQ|WZxB2oqsNk;zT?5sA`$}Y2T0mXf{p3qf}sFrKbKVx0AtL}IWaNdk%SW;G(y;O|3{TvKzEbQWPq5_^tV{bsHaal*1B zUL^JUY&Q*^s<_la;?&74A`=joWD8gG4&#Ki$X+_ z7!u>X{c7mUNHU4U(D{wXEI2+wGLOWV?H-X7v`WHq#p>I6NTeF3B=I3J?&lGaC|DCn vVn}@YPX9G@0!Wm3=#?%7Eu9@!q;tXcesr6`k4`=FvS6L*|I7aYgf12C diff --git a/MDK-ARM/4G_test/save_time.crf b/MDK-ARM/4G_test/save_time.crf index 59076f8163514dace1b3140b6a86a49e23634d4d..c069092d3ac4c82b3af69e6cb944edefe7be5167 100644 GIT binary patch delta 92 zcmcci!u;9`^9{k=T7s&6oU!efmfb~YP?V`PJVsQbNco@ z>FnZ#2a6Y?)kfL8<40ZPsrI-$=WCRqLZK_c%NIkT>KeDVrLn2S-TbcIcGGS%q>7}D zNEJ(2q)Mb7kt&t4N*k?Dr_y(x(x(o| zW6ioM{cF2^{pj)kz9c=^scnaRarXuJ;{BKO*Qbl74gB(^uC*jg)osO>8vQcJtWWQhdUy(ljtEc7#A$F8B=xQ z#oM|LIks1@Pu_rILej}^OcgC$ScMUGwwFxRRCs0`mZf7%V~eC6Fy3nd;%+J8xr?vt_W}7OLPDEd5zi#nF08b{=Otg*mc> z9MiR&sd@`PcovQ+2{sTUd5j2Hn$pFXp3-&lhc2@pz!s^1{UafZX3~j1GKL8f!92-e zoh-qK3Oi^Zd*~vi7$p@*l6tI?ChU>`Dq}(~{3MPr$s$Hdu|RCtBo(lJEL6iy>d`}d z7$@DBBOAz(J?xV)I6e`Y5F|c~kO3sfFqTO*wnzZ>J3=R#$pHF@>__65Cn>Cx3K*XX zQ8bWQbdfwpNj;LphgGtHUDAol&xAer$uPpC8!?i_0?A{O$bJx9aFZqUke@Iv6sa=Y zhdwR4SkSI1u3f5^M12@@2k8n(#(5gu( vb=*+uPy7+nkIRj79PlAWBG@NUIPMB51W5)XB#Q*eW0`z~EiwW7Jzf4612OcU delta 2267 zcmZ{lZETZO6vyu~+A-LAZwEtX*h~jw^TUSiR$lFJgo49t1e2+dY;21IMK=%wN|Y%t z1B$ex$mA4U@g>CYp(79*yALB01qJQmG$dlunUGXnB1<3{zK{+5-<_v+AK=5uxjnyg z&i~%?+~;Yef7zM-WkH9Lb-w7DDsVX}oD~b^2tzbA)vvBw+0^8ihh@WZV76GUUGDW|x);u0P%)o+LUL)AtHQb5>2$j2 zmyleS{~vN_qN(!b`t>b!PuFi<-un5&Dr&z^oPrzFBjlK; zrp1O!Rfl{~N-Vfgl|GPC^ApM%``xQ{WZ$PjY|C0@zh7+(;@3-z5Z!oD&7_9S%5LnY zz?Rj_Tb& zqy^t%!D@u^xpEzr)vOr8@(MlEiGIz!Qk1Y_tq+PmYV<*|2jMKb`id&f=##W{vzlie z?UQ1VZtuX};%&&hMB~V`ZT})IdWJ=P2nAU*|DrCMIOZ^xi}{$2FQwSYqKQLj6{3+t z5RD)l;yUkFQuI+v0E5D+hUe;~z`Ib4UQR2%L3`d*1r|hhb79TbQgpIl97_ue4t^uW zdKPRu48bz$I1It+D^m1uT>{H&-+k@Rg`mk0?3U}ug>lNL5dufxPoOf zwd_Ogk2<$#ugasUE~ShF)pa2^iSTKDIQ}lQ@KIQY{nzyvC!SeChrKj{u#rczj=;sK zO1oOxsNF6Kz}Y(gl)`D=+G(`yh?;FgX-Jd)NhF)eO)3wfbd;Xe&O#k8D0bu7RW`dTN4XjAheVQYAKb4hEOO zBmI<%JT$J0k}`duvu2T`H6dN3($oGdRTK`Ps9_T6W70|^n(P8eJ%@`-x~b{}NMusY zWhPMyXmWEB`IgBj4QWzrPw(J+CS_E962uFVdO|<(?dhZrP5dBh&G{slBxpdBq$cLQ zx{|oeP@yK^&&eEhZ7N^?*b{QhU3@WRw~;83S2t z*4$;{rd~}vGnJ?@$-gO`aS;6R%?rats7|{m?a(exVK{3NRhZa2`1?qN@hLh>BRahQ L1ts=QeEa?b4<=4O diff --git a/MDK-ARM/4G_test/shuiliang.crf b/MDK-ARM/4G_test/shuiliang.crf index 038ffd22b63c968640357bce2bf7643708c5d2fa..3f372cead13c8b3a68498d78a9510b5437c0684f 100644 GIT binary patch delta 93 zcmex%-~8Ks^9_DnTiftU%1nSq!Eh*^P{4T#x+ Wm;;D8ftU-3xq+BxyCM(o)yDvw#u`fi delta 93 zcmex%-~8Ks^9_DnT*r5IA7oiftU%1nSq!Eh*^P{4T#x+ Wm;;D8ftU-3xq+BxyCM(o)yDvu^cqV5 diff --git a/MDK-ARM/4G_test/shuiliang.o b/MDK-ARM/4G_test/shuiliang.o index b12338b2301b5446ded2df77f860293e3b12730e..af1c45bc108fb507e5c075e0a53ca8ba7413060c 100644 GIT binary patch delta 1418 zcmZ|OUr1Y590%}o(O&QW0=|Gh(9xg_6%N1Kcl3>L*w{_dRF+-g7GcHE!;W5tYgJbg4AkUrtq ziQvbB$wV;z$;``{IhCo^$S>K`Yr5|B3^~D>y=|(jD);omNJ?t+j;VV0cIn4}q>LF1lWUk29PM{a zHCFCfzzz#HQFmJKqDOGH-ZRy-!sWPb!~_$m`=&a!*KrLcPEEr7g&C}&6pxTV~MO_i)2uf61)hKUPMVh#>psh zB!hKQfH5o-(Lz=*KsGQ;wlPawSSClXLqe!KBP7s69wJUWm>^kPC;cdq5Zqr0qp(N@ zgQOE_62StAVU>(xmt;|YR#-$Id4M6}#}t{z5-DO!s8)Zv`_SRjj7B@eJGR4b*GYwrv<%4cw)FD(<~W=R55 zB!wlC#TJ=C&DTN!LE=S}_%Kd7ks~pzlLU+lLKZD#1_PvkVN%2_*}yW{#13gj-I(A< x4~Zd85||(bTqi}8$OhaOg-uw3P1*6`MfngvAT2}h_it-;O3wA~BUkkJ`3K2ctd;-( delta 1981 zcmZ{ke@t6d6vyv_7COhf7iMuYmhjU-V!^h6*$5ycbHNB>xMtxGSPiLUS<2)`8O#A= zuBdUMTZElOVPUbE7$IVU=`z{emg-O;LgGJDFj*v#m|@0TVw`1qZqIvrB)UIN?s@lf zzUO=1?R^cOD7|u`^kkZn_*r^wyv>>Ba<~dJn8G|B_w!ZHc|2(u&io?h_9EA|U z48|)MF&MEJCJZx19EM~Tj13r%U~I%lz)(Yj@jPQFuHc!xLRTJK`H&Y`oGwSX!{Km3 zOpwLB7)--{^G~2SL|u7XZ~ zO@rrv1I`tTa!4!@`JtcU#CNLo|EeJUaj_ZR-6S@Iezb~i{?MY-&|8@z^&$M+Q^FRy z;S}u~H~rTn^iqjPe26gpSrm@EAkv;x&cM}Xk!cPFIrBozeoQUrIqQO?T1*2Uadr|` ztHq;G*&-4ZE7Z4$Y;(>iXImg?4_1_6S_UnRBFlu?G$i>%rcwcGSf)0A%$b!j7N;=Q z3^gx`C(HrdvcRevm2XdSwi}M^#rg#pZpF4^7diVB<_`!fEVc@v)WM3}ZvH|J5p`oz zoXtfw<~dBaMW<9O(BFo3y_XHU2C^H#turLGf63Vek}hFdA*ETStDL<;@8|R5`wc<2 z9~~!fyBBV@VZk-d0;HP6)I^3CAf+7*tzpB^M}|4LHAIGCOeaX{|BACZI?=hWIXg>^ zk#=-!2K5j+2Cj2vBi#t5KDc=h&8ImF(}~W(IF_lmaVJqb(N=O~-*A>d$^=YnqmGIf zsyeXV_AMT_R-Xe3{sKxC3?qr1{+>g1wMd4A4xC~JR&Y}ZKyoK8Rw$9n4tQBEmC%oi z+V!i^$^tE&*eU>vvS1R-hjE#LTwK%{tkXxtxejC90(47q3&|F37)~8bFe^#%vOzWz zaYM?hNPI}%#OoukP%4qT&?HI1Z%DLm*+d55k|dSC87>?Jf&3E1#6NFtRp*#j6qcwk}#6}+C006*kM?b;HuGWFOex&ktBkoOw;Tm zQVb>CNZfZg8_`H3k-N|@iT4lAM$L302ZA`uf* z9YbPcg6-DGHQi@e5p>C5<@){CrjCkNPPs9fOk`y4(r@lem zys#*V4@r*Z^Rw=gdtCY;(S3d)G6~(1Od-){TPCsqvyvG5Xpj+01|twc<=+= zA>xH5Nqk5uG|iv7&m~Ewkmx=U-AC=ik75Z5afyk^QV1T!YHb5BO%HZS3BU&74@#7scU48$xz%nHP8K+F!r V96-zo#9TlOQp>Y_2{$j>O8`uyAS?g? delta 92 zcmZ4W(tOoR^9_HwxQ_4aKFG!Z1cxWHb5BO%HZS3BU&74@#7scU48$xz%nHP8K+F!r V96-zo#9TlOQp>Y_2{$j>O8`pJAS?g? diff --git a/MDK-ARM/4G_test/stm32f4xx_it.o b/MDK-ARM/4G_test/stm32f4xx_it.o index 192ce5549c035c8332a051188ce2c9583f79c733..36ebc6b90ff0a3939b7b24df3f5aee8e6939d2c5 100644 GIT binary patch delta 3083 zcmZ{leQZN zwe@cA55mqLg`FD4B8&nI8-^WYF~&m}g&0dPK7+9oqXZDO$xY_G%cDvnPT64P7P)`l7;7olx*-AM8GP;BK7+{Vlmp zJ3+p2>C|g~V~7$VL^lrWAEZU4!v<1D-S5bCc0ZOunm&%Dh!~eoa11 zt_fMJC8==&wbQ@>Dv!zv+iwlguhKGDj;Pou#~z~;$Bw;gh#J)+jpf~J@Z#iqhPbzw zzB(+|QSYCyxrVcbC^k2DPi+ol8x6jP9R)8K;0G=6xNs@Gdt9z9*fnX;&Es;t{lugp z;r))T?ehf8CN|+Q--Kj2bh>P#6j8%^Knrwbix@vRL1D%j*0u^|%3`S5@nIEc;0N zJ*wR{giV#``_vH6s}hcjc-kqdzKG5l;E+l?a)&Q0d*w}kF+{t{3;op)udBRSnOhH)I&yq!B(zM=a5c#aQ^Z%5lj z9Wm+D0(6+CJ{rbUP?a(0a!@X(bW9f8T^YVh?GmChwEhypGUUUw$o43G=aQ_%jfR=F z&;(CyG{@6kT7DT*4>j`CN8jKnNCP|_qhIrspcE!O`KT0b^Br74o=JS4s^j1#D=fZ} z-oGqYp+zqYuJe~XwNs4a{D{lF!>j3J9B~0Ey#mvpXUdcbQ5Tz`JhN6AoEV#Eo~ckK zN&25*(s`y*nR)79Q}md%gDPblG|a}8XFjJ)11+#=%`+}#+R66;j6ct8R3<=SHvKRw z%#(6c^E6Isj(HNi*5qE&robB$++(H1Yv{@cIGH{gU~@XpY@sVDWTcq8R#_SNE^(#m z55Yruyk1pGP%oPzhn3NwObf->1oF(2%8XL!RhV?1X`=Fv(WQ%dd#M!r%;$JY-S{}2 zfuW*nvPgScp#-L7`ddU^K*NyFwWnW;D;}OSCL59olO8_cd8bt&>1L6;(pM zNkoMhJ*!X!g&Cz8?Nq3S<`^|x2l|RaE!21&s2_+9Tu1RX8eov*n3t&gI?j48r5L$B z0@|-o4^@8z6kyb)P#^U&iZXgdp&-Q=Ic@-TD|C!XZvgojeM_NH>SA=7(YF=CX#wfc z)lw9i=lI>+ZRtrqd6?WAbSP^U+1AhtNm;4)ms#p3>g5{d6j!+vV+HE}Yf!bBrG;#< z3Ms10Ha}Aa=b1u|W4#n3_`l=-ykF3s4{^a^=9x-sV{cG%5`2z%iPP$RLT%VZjUU6b zF@k zrx^2NpSLPRnLdIn2BQ zJh#V{bZ7>(@N>W|jV;OqsFzJ2OzwW3$n}Y_nXk2W(3CZcY<0By7G7FMopprURJj)Fx`m`xm|QuZ zGJEL^8$V2$xrHw)(@*+sm>^7(X`WLiK^<(8Ftw&>XM^8&=8k$PwwZiSuFC=&KTMfv mzM1Rd`;@!D!IOaCuLm7_oa delta 3020 zcmZvdZA_cj700ic-LM8fm#io+!)^(oG1cnScAxbI*OV9UkA@H@^8`o~?Oc?JFLaKQG`56z40OYHSQ{t$nevF)!c0vCLmu z<}3YekLUM29vfN)+7Hm|Xb!Z;(3YWPqWuugl zEYlzGRr-8BKjjY^yUb6&88kfRr-4CZWn^^FIPkM&uk9}Jc{eJm`?It3{foBj$On&% z*X$Ad|BVw>KdNjDV6MiUZwCX7fuen(x>qA(FX)|mDdF3$?-@%7f>=YRf;uy@twA>} zH6(KCS9)yu61kC{xAn_QWyqvk_G?EZ|9ATD6}E1g`KMmz7#TEF6CE8!w=is|R@&W< zZtn?09i+Y8`Uz?t(b={lY8%lWNA+I~l}CHe=mI->U3BR<#?GS~lC(EZ8fuTE6`j%9 z&a3#Gt(4kpQ|dodc}(Xz?gOF7F(fv9W~h$EIcyJT_>A^AkNnM0IjQmgmGNPqB6=7_ zN%S629eUL8FYU37(*X`8)Q{k(K5M9IT5$|39y+eG9S6@Fs#_LVIA*A@tg8GhHZw`J zXOZy$c(tq~Gis`T~vEqFSBLS90of}V&=*+=;&XtlNz8*s{9x`30^hS z4x0H4OY0oP)S;V(`h-rO(m50x)!J4-Q;bV)@u@EEeH7hssn|VjsFKC=!=g2 z$}Sc6lXDCeC-0dRzmS&i&Nu8fx&d)sop7mpsZ=|}L7~jIY)xwME=tZ1Zn1`xyu}1Av1+&flZ&qY^J@ui`vWJF1MLcNe_9o zJ>a$>I>Q0CfIx}MI?MJFUAl}#Pf*1bpz*G$*6I9Mv$GnSAm|r z3bb7iz7ULB8SM~MKru#9Mn4x+MDA-qu4_7rc3jggyulU*%>cGNRCf)l3eqs6Ax6Ix z)I`qfKv~y;ngxZZfl)o9*9EmxKchZIZwl(71xE9Xel4h%YHtA5+yDv*3R4fG!;Ib% zgwq0YMxWGbb?Rlb$yrxSg3p8h0e><4H*-Ko$33ZVl!D_eiz@9nY>fr zSx=jssB#>)*2a8fy;g;(nf@eeN>GeV5+=Q-UintLZ-N(iOx`E8%c+G;5N1zmt}q>) zK#gJMMTKU@5Y;hv-U9Cc-;x?XA~Qv)flVCdNXkTI-~G&!&uDebA?Gn6zf23vb9`Fe zPmP~koGD}8N86|MdS}RQ7LU`w7yMkOkuqfA3HdV4F>eZ(SU8uX4YvClS5N%>MiEgbRF+Ku46I3NY`nD!H?{R9EK>y SVL3fQa9n?1t3!)_?cV`YUywHd diff --git a/MDK-ARM/4G_test/wendu.crf b/MDK-ARM/4G_test/wendu.crf index f3ea699fb5584d7f702d54d0c573457aa3ecbcef..ecfa732adcd8d41bda95e1740d24fa303b24a7a5 100644 GIT binary patch delta 92 zcmcco)co>O^9`%GxZ1z&I>^QV1T!XY;rfWgZC=mazMh*Ah?#(x8Hibcm=%cGfS4VK VIe?fGh`E3mq?Tv#l5 delta 92 zcmcco)co>O^9`%GxQ_4aKFG!Z1cxVY;rfWgZC=mazMh*Ah?#(x8Hibcm=%cGfS4VK VIe?fGh`E3mq?Tv#l5 diff --git a/MDK-ARM/4G_test/wendu.o b/MDK-ARM/4G_test/wendu.o index db36ee14f6519191c766d2ef1583b456005895ff..94fea1b28887e4843d5db5284f6c8d41c34b4aaa 100644 GIT binary patch delta 2402 zcmZ{me@s(X6vyv_R#E%zEm9eoC7?Er$kc6^&W$*uU_@E6Wo7XP z$#fJ&sXIDho5~+#1BM%}B!f(onhgWfZSKb(uxtw&lSu-Jf4B{jozv6qy=3~w$vN+S z&N<(6@B7hq4zBGPT-%(j-MYM>BhBf{_IZ3O7Ya=T0u`G|HUt9M3%z-3{P}ApdQi55DS>+l{NNZkc0Tm3GVYS>k0)h-9%%Ybo259y!u28&;%vy}P^~cb;hR7OrmT zNwP<_{wklgM9%#o@2zswdh)Pypmuff-siUExwe$P64(RjrRphoaiem>)s1R-WW{_n ztUo%le6h-oc$TU+<)itjr79~jvP#W=44=$b&PdKPs&>xY|4$P6xLnyDQ|R4_g?9t$ zz%s2BF6>chPOo79P*_+vu212$JuZA4CTrAutL+OZg52X6hM`yw%>mOP95fm+1`Tok zFSz9Ad|RIs6P!NgeQ{5rvX632258Dll^SRPzD#AEef*ubU! zVJR$pg!$h}@d8WQn(+w3klBngcHnX=*A?BAq6f85>0C=15`M{O!T$cNj6cv2xhhUu2*ZnL-O8l;t!3DglS}_#1sGQ{cBNA4;rshGg z1xJ{GCS24)aE09{xqh&Q(Ye4)t^l4VR{{0t^oEB<=_Ck{5mD3cJh5%Jp$ zokk{|Fis?_8>EGa4GPpVwNga}u zBtFs4nFOJph-r6VKhDg*zZZH{w0U~22a+Aq@ z&_6=rOfz(DGjYKVA_YkD<2xNmJUd-Pf=Ci~`**Gh!!(hosoUMe1SJ delta 1643 zcmZ|PUrbw790%}oH;Szr=dMDuD2Xk@P^Qk7F;~bo*G#vPY?CI70i(9foB^{K$`eE% z+DIbIZI(IxQe{f#9!jzyHEPR~V0>r|(V>eO$zs4r0%jWeM&qCO`>vWjh&TD=lY74R zcTUc^?VT#@zf#zra2j(NSGu~+>umNk@2*#d3WbihAAKqma@KoywRv0HJgu)USHH1b zZAfjB+ALKeWs$0sx=YF`Ws|yFYKzoXsjBR9wLYJ$Yn~2JY(San%VV3#ar&>AiXH@c^VLxLwRyKU5RZihppDc0{ z5g9VpF-)w;2$sRmwK`LtavO}Z63n29Tt`r_SaVvfmGgC^7_6Z{I#CoVyT8&Zu(`a8 zDfrJx5}Bdoa(S1tpSzD?4xb zeW%qa{Mu(WAR_n15e$=4$S{q4uT`Rad~z1&Wr4-(TFv}(eB%hpkQ~ndxrUTrasQyz zaXcTD35y)wi`ut^C*db6=pnZ-LWVG1W{KoryC68>B|dbK4#Y_e6J!YUB!?22f$JS% z4eewdQDQ}sI511xSS3E#-xUIAC7pnSob;na#^HKTNTZ!}B1&RN zk|E5JajcRY?C%TL&`MSiAsrYdd1S~U7KrR`ObDZi^dm@Qe`E+L;z5C=Q6ve}UKFhG z6DN9z?2mL~nyh1qY=i9s!3QttMHlHuoH#L2&gRQmshqh!lx!UBB#kJUL6YP#OBS(8 zR$w0&9B3s@M2HW=q!$^|j|Gx|krL!DOY#U3*&mVjM-HGs0w|I&YA*>h@RK}x$Rb9F z6Vt?vB@%}1BcU5!GKDUZL!8{e1X;v9Q792BT$cqm+Q~sg1;?S6Of@JUfqyUg7Tmu6 E2K{^x_y7O^