Ouj_Junchao 2 vuotta sitten
vanhempi
commit
b492cceaa4

+ 2 - 2
build_log.txt

@@ -1,6 +1,6 @@
 Build started: Project: ble_app_uart_c_pca10040_s132
-*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'E:\keil530\Keil_v5\ARM\ARMCC\Bin'
+*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'Shoes_FW_APP'
 FromELF: creating hex file...
 ÿþ".\_build\nrf52832_xxaa.axf" - 0 Error(s), 0 Warning(s).
-Build Time Elapsed:  00:00:04
+Build Time Elapsed:  00:00:01

BIN
dfu_readme/app_dfu_package.zip


+ 8 - 8
dfu_readme/app_setting.hex

@@ -1,6 +1,6 @@
 :020000040007F3
-:10E00000F289035F0200000001000000010000002F
-:10E010000000000000000000B80F0200E5D6CA4969
+:10E00000E8FE87C3020000000100000001000000DC
+:10E01000000000000000000068130200F6425E3DB0
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -36,12 +36,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000ECC55D6947
+:10E250000000000000000000000000005510E93A36
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A0000001E5D6CA49000000000000000000009F
+:10E2A0000001F6425E3D000000000000000000009A
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -50,8 +50,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000F289035F0200000001000000010000001F
-:10F010000000000000000000B80F0200E5D6CA4959
+:10F00000E8FE87C3020000000100000001000000CC
+:10F01000000000000000000068130200F6425E3DA0
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -87,12 +87,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000ECC55D6937
+:10F250000000000000000000000000005510E93A26
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A0000001E5D6CA49000000000000000000008F
+:10F2A0000001F6425E3D000000000000000000008A
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 7924 - 7865
dfu_readme/app_setting_sd_boot.hex


+ 8 - 8
dfu_readme/setting_sd_boot.hex

@@ -11063,8 +11063,8 @@
 :10DF600000000000000000000000000000000000B1
 :10DF7000000000000090D00300000000000000003E
 :0CDF800085A6070000100000000008004B
-:10E00000F289035F0200000001000000010000002F
-:10E010000000000000000000B80F0200E5D6CA4969
+:10E00000E8FE87C3020000000100000001000000DC
+:10E01000000000000000000068130200F6425E3DB0
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -11100,12 +11100,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000ECC55D6947
+:10E250000000000000000000000000005510E93A36
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A0000001E5D6CA49000000000000000000009F
+:10E2A0000001F6425E3D000000000000000000009A
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -11114,8 +11114,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000F289035F0200000001000000010000001F
-:10F010000000000000000000B80F0200E5D6CA4959
+:10F00000E8FE87C3020000000100000001000000CC
+:10F01000000000000000000068130200F6425E3DA0
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -11151,12 +11151,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000ECC55D6937
+:10F250000000000000000000000000005510E93A26
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A0000001E5D6CA49000000000000000000008F
+:10F2A0000001F6425E3D000000000000000000008A
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

+ 1 - 1
dfu_readme/自动生成升级固件.bat

@@ -15,7 +15,7 @@ echo=
 
 cd ..
 rem KEIL工具的安装目录
-set UV=E:\keil530\Keil_v5\UV4\UV4.exe
+set UV=C:\Keil_v5\UV4\UV4.exe
 rem 当前目录
 set Front_PRO_PATH=%cd%
 rem 工程目录

+ 15 - 15
pca10040/s132/arm5_no_packs/_build/arm_startup_nrf52.lst

@@ -531,21 +531,21 @@ ntf -I..\..\..\..\..\..\external\segger_rtt -I..\..\..\..\..\..\external\utf_co
 nverter -I..\..\..\..\..\..\integration\nrfx -I..\..\..\..\..\..\integration\nr
 fx\legacy -I..\..\..\..\..\..\modules\nrfx -I..\..\..\..\..\..\modules\nrfx\dri
 vers\include -I..\..\..\..\..\..\modules\nrfx\hal -I..\config -I.\RTE\_Shoes_FW
-_APP -IE:\keil530\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include -IE:\keil530\Arm
-\Packs\NordicSemiconductor\nRF_DeviceFamilyPack\8.32.1\Device\Include --predefi
-ne="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 530" --predefine="_R
-TE_ SETA 1" --predefine="NRF52832_XXAA SETA 1" --predefine="_RTE_ SETA 1" --pre
-define="APP_TIMER_V2 SETA 1" --predefine="APP_TIMER_V2_RTC1_ENABLED SETA 1" --p
-redefine="BOARD_PCA10040 SETA 1" --predefine="CONFIG_GPIO_AS_PINRESET SETA 1" -
--predefine="FLOAT_ABI_HARD SETA 1" --predefine="NRF52 SETA 1" --predefine="NRF5
-2832_XXAA SETA 1" --predefine="NRF52_PAN_74 SETA 1" --predefine="NRF_SD_BLE_API
-_VERSION SETA 7" --predefine="S132 SETA 1" --predefine="SOFTDEVICE_PRESENT SETA
- 1" --predefine="__HEAP_SIZE SETA 8192" --predefine="__STACK_SIZE SETA 8192" --
-cpreproc_opts=-DAPP_TIMER_V2,-DAPP_TIMER_V2_RTC1_ENABLED,-DBOARD_PCA10040,-DCON
-FIG_GPIO_AS_PINRESET,-DFLOAT_ABI_HARD,-DNRF52,-DNRF52832_XXAA,-DNRF52_PAN_74,-D
-NRF_SD_BLE_API_VERSION=7,-DS132,-DSOFTDEVICE_PRESENT,-D__HEAP_SIZE=8192,-D__STA
-CK_SIZE=8192 --list=.\_build\arm_startup_nrf52.lst RTE\Device\nRF52832_xxAA\arm
-_startup_nrf52.s
+_APP -IC:\Users\Administrator\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Cor
+e\Include -IC:\Users\Administrator\AppData\Local\Arm\Packs\NordicSemiconductor\
+nRF_DeviceFamilyPack\8.32.1\Device\Include --predefine="__MICROLIB SETA 1" --pr
+edefine="__UVISION_VERSION SETA 530" --predefine="_RTE_ SETA 1" --predefine="NR
+F52832_XXAA SETA 1" --predefine="_RTE_ SETA 1" --predefine="APP_TIMER_V2 SETA 1
+" --predefine="APP_TIMER_V2_RTC1_ENABLED SETA 1" --predefine="BOARD_PCA10040 SE
+TA 1" --predefine="CONFIG_GPIO_AS_PINRESET SETA 1" --predefine="FLOAT_ABI_HARD 
+SETA 1" --predefine="NRF52 SETA 1" --predefine="NRF52832_XXAA SETA 1" --predefi
+ne="NRF52_PAN_74 SETA 1" --predefine="NRF_SD_BLE_API_VERSION SETA 7" --predefin
+e="S132 SETA 1" --predefine="SOFTDEVICE_PRESENT SETA 1" --predefine="__HEAP_SIZ
+E SETA 8192" --predefine="__STACK_SIZE SETA 8192" --cpreproc_opts=-DAPP_TIMER_V
+2,-DAPP_TIMER_V2_RTC1_ENABLED,-DBOARD_PCA10040,-DCONFIG_GPIO_AS_PINRESET,-DFLOA
+T_ABI_HARD,-DNRF52,-DNRF52832_XXAA,-DNRF52_PAN_74,-DNRF_SD_BLE_API_VERSION=7,-D
+S132,-DSOFTDEVICE_PRESENT,-D__HEAP_SIZE=8192,-D__STACK_SIZE=8192 --list=.\_buil
+d\arm_startup_nrf52.lst RTE\Device\nRF52832_xxAA\arm_startup_nrf52.s
 
 
 

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
pca10040/s132/arm5_no_packs/_build/ble_app_uart_c_pca10040_s132_Shoes_FW_APP.dep


BIN
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.axf


+ 10 - 11
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.build_log.htm

@@ -5,11 +5,11 @@
 <h2>Tool Versions:</h2>
 IDE-Version: ¦ÌVision V5.30.0.0
 Copyright (C) 2020 ARM Ltd and ARM Germany GmbH. All rights reserved.
-License Information: lxy Administrator, 11, LIC=76F5U-S1WWA-DY9V3-A71WD-QJ6CF-HP6IP
+License Information: Ou Administrator, 11, LIC=EXJT4-FD1MZ-JJG6S-L29G4-S14VJ-CPP65
  
 Tool Versions:
 Toolchain:       MDK-ARM Plus  Version: 5.30.0.0
-Toolchain Path:  E:\keil530\Keil_v5\ARM\ARMCC\Bin
+Toolchain Path:  C:\Keil_v5\ARM\ARMCC\Bin
 C Compiler:      Armcc.exe V5.06 update 6 (build 750)
 Assembler:       Armasm.exe V5.06 update 6 (build 750)
 Linker/Locator:  ArmLink.exe V5.06 update 6 (build 750)
@@ -21,13 +21,12 @@ Target DLL:      Segger\JL2CM3.dll V2.99.38.0
 Dialog DLL:      TCM.DLL V1.42.0.0
  
 <h2>Project:</h2>
-F:\exampleProject\test_sleep2\git\examples\long\shoe_mcu\pca10040\s132\arm5_no_packs\ble_app_uart_c_pca10040_s132.uvprojx
-Project File Date:  07/27/2022
+D:\Git_Project\shoes\smart_shoes\nRF5_SDK_17.0.0_9d13099\examples\Shoes1.3\shoe_mcu\pca10040\s132\arm5_no_packs\ble_app_uart_c_pca10040_s132.uvprojx
+Project File Date:  07/28/2022
 
 <h2>Output:</h2>
-*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'E:\keil530\Keil_v5\ARM\ARMCC\Bin'
+*** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'Shoes_FW_APP'
-FromELF: creating hex file...
 ".\_build\nrf52832_xxaa.axf" - 0 Error(s), 0 Warning(s).
 
 <h2>Software Packages used:</h2>
@@ -46,19 +45,19 @@ Package Vendor: NordicSemiconductor
 
 <h2>Collection of Component include folders:</h2>
   .\RTE\_Shoes_FW_APP
-  E:\keil530\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include
-  E:\keil530\Arm\Packs\NordicSemiconductor\nRF_DeviceFamilyPack\8.32.1\Device\Include
+  C:\Users\Administrator\AppData\Local\Arm\Packs\ARM\CMSIS\5.6.0\CMSIS\Core\Include
+  C:\Users\Administrator\AppData\Local\Arm\Packs\NordicSemiconductor\nRF_DeviceFamilyPack\8.32.1\Device\Include
 
 <h2>Collection of Component Files used:</h2>
 
    * Component: ARM::CMSIS:CORE:5.3.0
 
    * Component: NordicSemiconductor::Device:Startup:8.32.1
-      Source file:   Device\Source\arm\arm_startup_nrf52.s
-      Include file:  Device\Include\system_nrf.h
       Source file:   Device\Source\system_nrf52.c
       Include file:  Device\Include\system_nrf52.h
-Build Time Elapsed:  00:00:04
+      Source file:   Device\Source\arm\arm_startup_nrf52.s
+      Include file:  Device\Include\system_nrf.h
+Build Time Elapsed:  00:00:01
 </pre>
 </body>
 </html>

+ 77 - 77
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.hex

@@ -491,8 +491,8 @@
 :107E9000C00090F82500012871D104EB840001EBAB
 :107EA000C00090F8240010B101286AD117E004EB5B
 :107EB00084003F4901EBC000026A3EA10AA804F019
-:107EC000E1FF0AA91120FFF721FF38B9002004EBD8
-:107ED0008401374A02EBC10181F825005AE00822EB
+:107EC000E3FF0AA91120FFF721FF38B9002004EBD6
+:107ED0008401374A02EBC10181F825005AE00922EA
 :107EE000364B04EB8400324901EBC000C16904EB5E
 :107EF00084002F4D05EBC0008069C01E05AD0BC589
 :107F0000089204EB84002A4901EBC000406904EBAD
@@ -501,7 +501,7 @@
 :107F30009B68CDE90132CDE9031004EB84002946AA
 :107F400001EBC0004068009004EB840051F8303031
 :107F500004EB840001EBC000026A19490AA804F08E
-:107F600091FF0AA91120FFF7D1FE38B9002004EBD8
+:107F600093FF0AA91120FFF7D1FE38B9002004EBD6
 :107F700084012A4602EBC10181F825000AE011E0E4
 :107F8000FFE7002004EB8401094A02EBC10181F8FC
 :107F9000250000BF00BF04EB8400054901EBC000D1
@@ -520,7 +520,7 @@
 :10806000002400200190EA48FFF7EFFF8246E8482D
 :108070000068E84988421FD1E548007E05280FDBEB
 :10808000FFF7B7FFFFF7CBFF0020E149087600F0CC
-:10809000E1F918B1E0A10820FFF738FE04F052FF23
+:10809000E1F918B1E0A10820FFF738FE04F054FF21
 :1080A000DB48007E401CDA49087600F0D3F918B1AD
 :1080B000D9A10820FFF72AFEDC4816F097F8002423
 :1080C00036E004EB4401DA4A52F82100FEF7EDF9FC
@@ -558,7 +558,7 @@
 :1082C00005B90FE000BF4FF47A7606B906E0DFF893
 :1082D00080814FEA86194846C04700BF681E051EC8
 :1082E000F1D100BF10F036FE781CC7B2062FE5DBD7
-:1082F00004F028FE002485E004EB44014C4A52F8C7
+:1082F00004F02AFE002485E004EB44014C4A52F8C5
 :108300002100FEF7D2F8054604EB4400484A52F833
 :10831000201001AB2A4645481AF0F1FDF0BB04EBF2
 :108320004400434901EB8000007A9DF80410884224
@@ -597,9 +597,9 @@
 :108530006FF440510844002822D10DE0322217A1E7
 :108540001548401CFDF78DFF21E0322219A1124889
 :10855000401CFDF786FF1AE025461DA10E48401C71
-:10856000D5E9003204F08EFC11E025462868009021
-:108570001EA10948401CD5E9013204F083FC06E045
-:108580003A461FA10448401C04F07CFC00BF00BF19
+:10856000D5E9003204F090FC11E02546286800901F
+:108570001EA10948401CD5E9013204F085FC06E043
+:108580003A461FA10448401C04F07EFC00BF00BF17
 :10859000FFF788FFF8BD0000F451002053443A2053
 :1085A000415353455254494F4E204641494C45444E
 :1085B0000D0A000053443A20494E56414C4944208C
@@ -641,7 +641,7 @@
 :1087F00000BFEFF3098000BF4046FFF759FA0A2493
 :1088000004B90DE000BF4FF47A7505B904E0054ED8
 :10881000AF013846B04700BF601E041EF3D100BF51
-:1088200004F070FBC167040010B50021132017F09D
+:1088200004F072FBC167040010B50021132017F09B
 :1088300064FC012018F0F8F90021142017F05DFC09
 :10884000012018F0F1F90121132017F056FC012046
 :1088500018F0EAF90021132017F04FFC10BD1CB5E9
@@ -812,20 +812,20 @@
 :1092A000006800E020467149086071480068A042EB
 :1092B00002DD6F48006800E020466D4908600846FE
 :1092C00000682346009069486AA1026801A803F07B
-:1092D000D9FD01A91B20FEF719FD6CE06B48006861
+:1092D000DBFD01A91B20FEF719FD6CE06B4800685F
 :1092E000A04202DA6948006800E020466749086049
 :1092F00067480068A04202DD6548006800E020463B
 :109300006349086008460068234600905F4861A1F1
-:10931000026801A803F0B6FD01A91B20FEF7F6FCC8
+:10931000026801A803F0B8FD01A91B20FEF7F6FCC6
 :1093200049E0012F47D15048007910B35F480068E9
 :10933000A04202DA5D48006800E020465B49086010
 :109340005B480068A04202DD5948006800E0204602
 :10935000574908600846006823460090534855A1C5
-:10936000026801A803F08EFD01A91B20FEF7CEFCC8
+:10936000026801A803F090FD01A91B20FEF7CEFCC6
 :1093700021E056480068A04202DA5448006800E044
 :1093800020465249086052480068A04202DD504819
 :10939000006800E020464E49086008460068234601
-:1093A00000904A484BA1026801A803F06BFD01A997
+:1093A00000904A484BA1026801A803F06DFD01A995
 :1093B0001B20FEF7ABFC4D48007801280CD10020A3
 :1093C0004A490870002504E0494840F82540681CD7
 :1093D000C5B2062DF8DB0DE0002507E04449681C06
@@ -1186,7 +1186,7 @@
 :10AA00002B48007818B329484068284909681F4A2C
 :10AA100092681E4B5B68CDE90332CDE905101B48F7
 :10AA2000016824488068234A5268CDE900200291D9
-:10AA300020480368204821A1026808A802F022FAF1
+:10AA300020480368204821A1026808A802F024FAEF
 :10AA400008A91B20FDF762F90020194908700F487A
 :10AA50004068184948600D48806888600B48006865
 :10AA60000860002408E00A4800EB0410007808B1F0
@@ -1370,9 +1370,9 @@
 :10B580001646C24607EB47011B4800EBC109D9F834
 :10B59000140020B1012811D0022826D11EE048460F
 :10B5A00001F002FC0546B54201D2002405E0344614
-:10B5B00032465146484601F03EFC18E0484601F04C
+:10B5B00032465146484601F040FC18E0484601F04A
 :10B5C000F3FB0546B54201D2284600E0304604466A
-:10B5D00022465146484601F02EFC08E032465146CC
+:10B5D00022465146484601F030FC08E032465146CA
 :10B5E000484601F0EFFB044601E0002400BF00BF25
 :10B5F0002046BDE8F0870000D891002002460021D7
 :10B6000006E00548405C904201D100207047491C8B
@@ -1652,13 +1652,13 @@
 :10C72000354800680028FBD03148006820F001003F
 :10C730004FF01021C1F80C0200BF2F4800680028FC
 :10C74000FBD000202B49086000BF2B480068002860
-:10C75000FBD000F017FC26480C38006800F00040C1
+:10C75000FBD000F019FC26480C38006800F00040BF
 :10C7600028B923480838006800F0004018B30120B9
 :10C770002049086000BF204800680028FBD0152031
 :10C780001B490C39086000BF1B4800680028FBD01B
 :10C79000152117480838016000BF174800680028B5
 :10C7A000FBD000201349086000BF13480068002830
-:10C7B000FBD000F0E7FBFFF7C9FE10BD240300101B
+:10C7B000FBD000F0E9FBFFF7C9FE10BD2403001019
 :10C7C000403501400DF0ADBA00C007403C050040C7
 :10C7D000FCED00E00C0100401056004020C5004078
 :10C7E00024040010E40E0040000400403C17004008
@@ -1758,36 +1758,36 @@
 :10CDC000601E10BD2DE9F0470446894617464FF016
 :10CDD000000AE56800BFD4F81080A84503D9A8EB85
 :10CDE0000500461E04E0A5EB0800401CA1680E1AD1
-:10CDF000A068401BB04201D9304601E0A068401B4A
-:10CE00000646BE4201D2304600E03846064661681A
-:10CE1000481932464946F9F724FBB244B144BF1BD6
-:10CE20003544A068A84200D10025E560002FD2D18A
-:10CE30005046BDE8F0872DE9F0470446894615467F
-:10CE4000E668A068871BAF4208D9616888192A463E
-:10CE50004946F9F706FB7019E06010E0B8466168D2
-:10CE6000881942464946F9F7FCFAA5EB070809EB91
-:10CE7000070142466068F9F7F4FAC4F80C80BDE88F
-:10CE8000F08700000FB4084B10B504A902AA03985C
-:10CE900001F0CAFC044602A9002002F05CF820461A
-:10CEA00010BC5DF814FB000057EF020003B40198BA
-:10CEB0004100009850EAC12018BF04204A0D18BF55
-:10CEC00040F0010040F2FF72B2EB515F08BF40F04A
-:10CED0000200012808BF052002B070474100080287
-:10CEE00018BF04200A0E18BF40F001004FF07F4227
-:10CEF00032EA010108BF40F00200012808BF052006
-:10CF00007047000000BF00BF00BFBFF34F8F00BFDE
-:10CF100000BF00BF0948006800F4E060084908430A
-:10CF2000001D0649086000BF00BF00BFBFF34F8F60
-:10CF300000BF00BF00BF00BF00BFFDE70CED00E079
-:10CF40000000FA0500BF00BF00BFBFF34F8F00BF56
-:10CF500000BF00BF0948006800F4E06008490843CA
-:10CF6000001D0649086000BF00BF00BFBFF34F8F20
-:10CF700000BF00BF00BF00BF00BFFDE70CED00E039
-:10CF80000000FA0500BF00BF00BFBFF34F8F00BF16
-:10CF900000BF00BF0948006800F4E060084908438A
-:10CFA000001D0649086000BF00BF00BFBFF34F8FE0
-:10CFB00000BF00BF00BF00BF00BFFDE70CED00E0F9
-:10CFC0000000FA050000000070B5C1482DED020B0D
+:10CDF00006B90126A068401BB04201D9304601E0C7
+:10CE0000A068401B0646BE4201D2304600E03846CC
+:10CE100006466168481932464946F9F722FBB24492
+:10CE2000B144BF1B3544A068A84200D10025E5608D
+:10CE3000002FD0D15046BDE8F0872DE9F0470446D9
+:10CE400089461546E668A068871BAF4208D9616825
+:10CE500088192A464946F9F704FB7019E06010E08A
+:10CE6000B8466168881942464946F9F7FAFAA5EBCF
+:10CE7000070809EB070142466068F9F7F2FAC4F8BF
+:10CE80000C80BDE8F08700000FB4084B10B504A972
+:10CE900002AA039801F0C8FC044602A9002002F08F
+:10CEA0005AF8204610BC5DF814FB000057EF020052
+:10CEB00003B401984100009850EAC12018BF042033
+:10CEC0004A0D18BF40F0010040F2FF72B2EB515F13
+:10CED00008BF40F00200012808BF052002B07047DB
+:10CEE0004100080218BF04200A0E18BF40F00100DC
+:10CEF0004FF07F4232EA010108BF40F002000128F2
+:10CF000008BF05207047000000BF00BF00BFBFF38F
+:10CF10004F8F00BF00BF00BF0948006800F4E06009
+:10CF200008490843001D0649086000BF00BF00BF54
+:10CF3000BFF34F8F00BF00BF00BF00BF00BFFDE7C2
+:10CF40000CED00E00000FA0500BF00BF00BFBFF31A
+:10CF50004F8F00BF00BF00BF0948006800F4E060C9
+:10CF600008490843001D0649086000BF00BF00BF14
+:10CF7000BFF34F8F00BF00BF00BF00BF00BFFDE782
+:10CF80000CED00E00000FA0500BF00BF00BFBFF3DA
+:10CF90004F8F00BF00BF00BF0948006800F4E06089
+:10CFA00008490843001D0649086000BF00BF00BFD4
+:10CFB000BFF34F8F00BF00BF00BF00BF00BFFDE742
+:10CFC0000CED00E00000FA0570B5C1482DED020B34
 :10CFD0002DED0E8B82B0119D25F000449FEDBEDB40
 :10CFE0009FEDBFEB84423EDBA4F140511098A1F1CC
 :10CFF0007F6108430FD0BC48844202DC28D11098DE
@@ -1799,7 +1799,7 @@
 :10D05000012001F021FB02B0BDEC0E8B02B0BDE857
 :10D06000704001F0B1BAA1489FEDA18B844256DA1D
 :10D070009DED100BB4F1795F0ADA51EC100BFFF75C
-:10D0800015FF042808BF01F0AFFA9DED100BDAE799
+:10D0800017FF042808BF01F0AFFA9DED100BDAE797
 :10D0900053EC102B51EC100BF9F7D9FA41EC190BAA
 :10D0A00095480621B0EE490AF0EE690A784401F08D
 :10D0B00063F953EC192B51EC100BF9F7C8FA41EC5A
@@ -1853,7 +1853,7 @@
 :10D3B0009FED251A08EEA11ADFED241A48EE811A16
 :10D3C0009FED231A08EEA11A68EE281ABDEC028B15
 :10D3D00001EE810A30EE200A10BD4FF0E440B0EBC0
-:10D3E000440F0CD918EE100AFFF778FD042808BF87
+:10D3E000440F0CD918EE100AFFF77AFD042808BF85
 :10D3F00001F018F9B0EE480ABDEC028B10BD4FF0F9
 :10D400007F40B0EB440F07D2B0EE480ABDEC028B70
 :10D41000BDE8104001F0F8B8012001F03DF9BDEC85
@@ -1866,7 +1866,7 @@
 :10D48000068B02B0BDE8704001F08AB8002DCCBF19
 :10D490009FED8F0B9FED900BBDEC068B02B070BD26
 :10D4A0008F48A04215DD8F48A042D8BF4FF0FF340F
-:10D4B00058DD9DED060B51EC100BFFF7F7FC04282F
+:10D4B00058DD9DED060B51EC100BFFF7F9FC04282D
 :10D4C00008BF01F091F89DED060BBDEC068B02B094
 :10D4D00070BD9DED060B51EC100B0BF02FFDCDE94F
 :10D4E000060181489FED828BA0423CDD8248A0422C
@@ -1944,7 +1944,7 @@
 :10D960009FED6E0ABDEC028B10BD12F11A0F1BDA8F
 :10D9700011F0004F09D010F0004F0CBF9FED680A66
 :10D980009FED680ABDEC028B10BD80EE208A18EE78
-:10D99000100AFFF7A3FA042808BF00F043FEB0EE18
+:10D99000100AFFF7A5FA042808BF00F043FEB0EE16
 :10D9A000480ABDEC028B10BD4200B2EB410F37D9E3
 :10D9B00010F0004F19BFDFED5C1A9FED5C1ADFED30
 :10D9C0005C1A9FED5C1AB0EE602A0A46F1EE400A3E
@@ -2120,7 +2120,7 @@
 :10E46000112BF8F74DF8BDEC028B41EC100B70BD91
 :10E4700031B504462DED040B2DED0A8BB0EE41BAFB
 :10E48000F0EE61BA0B989DED0A0B20F00040B0F160
-:10E49000795F0DDA51EC100BFEF708FD042808BF78
+:10E49000795F0DDA51EC100BFEF70AFD042808BF76
 :10E4A00000F0A2F89DED0A0BBDEC0A8B05B030BD63
 :10E4B00053EC102B51EC100BF8F7C9F841EC180B8A
 :10E4C0009DED0A0B53EC182B51EC100BF8F7BFF82D
@@ -2405,13 +2405,13 @@
 :10F63000394890F82800432855D1374890F83710BA
 :10F6400090F8362090F83500334B1B7ACDE9003026
 :10F65000CDE902213048C379827930A104A8FDF7B1
-:10F6600011FC04A8F6F721FF0446214604A80CF07B
+:10F6600013FC04A8F6F721FF0446214604A80CF079
 :10F6700075F800200490059006900790264883793D
-:10F68000C2792DA104A8FDF7FDFB04A8F6F70DFF34
+:10F68000C2792DA104A8FDF7FFFB04A8F6F70DFF32
 :10F690000446214604A816F09BF824E01E4890F882
 :10F6A0002800432819D11C48C27A837A417A90F8FD
 :10F6B00034008DE80B000392174890F8333090F82F
-:10F6C000322016A104A8FDF7DDFB04A8F6F7EDFE35
+:10F6C000322016A104A8FDF7DFFB04A8F6F7EDFE33
 :10F6D0000446214604A816F07BF80C2119A00CF072
 :10F6E0003DF8FCF7DBF816F02DF800E007E0FFF737
 :10F6F0004DFD0020064908700649087005E000200D
@@ -2506,7 +2506,7 @@
 :10FC800001222046611CCCB20DF800200322204640
 :10FC9000611CCCB20DF8002001222046611CCCB2C0
 :10FCA0000DF8002000222046611CCCB20DF8002087
-:10FCB00008222046611CCCB20DF80020002007E08D
+:10FCB00009222046611CCCB20DF80020002007E08C
 :10FCC00027490B5C2146621CD4B20DF80130401C60
 :10FCD0000628F5DB22483238C06A020E2046611C35
 :10FCE000CCB20DF800201E483238C06AC0F307427B
@@ -2664,7 +2664,7 @@
 :100650006170705F6465746563745F4C5220736190
 :100660007665206261636B7570206661696C00005D
 :10067000D903030004460D46164632462946204655
-:10068000F7F740FFFCF73EFC014840797047000057
+:10068000F7F740FFFCF740FC014840797047000055
 :10069000E83E002010B50A4A0AA14FF47A70FAF732
 :1006A0004BFA0B49A220F6F71FFE0A4A0AA14EF6A2
 :1006B0006020FAF741FA0C49012002F0E3FF10BD77
@@ -2766,7 +2766,7 @@
 :100CB00001E0FEF78FFA05A8F7F780FD0020089005
 :100CC00009900A900B909DF819009DF818109DF856
 :100CD00017209DF81630CDE90032CDE902109DF8BD
-:100CE00015309DF8142041A108A8FCF7CBF808A8FE
+:100CE00015309DF8142041A108A8FCF7CDF808A8FC
 :100CF000F5F7DBFB0446214608A814F069FD14F063
 :100D000021FD0120334908704FF4FA613448F9F7A6
 :100D100085FF00BF5AE030480079002805DD00203B
@@ -2777,7 +2777,7 @@
 :100D60005DFFFEF737FA0020089009900A900B907B
 :100D70001948C27A837A417A90F834008DE80B00E2
 :100D80000392154890F8333090F832201EA108A83D
-:100D9000FCF778F808A8F5F788FB0446214608A870
+:100D9000FCF77AF808A8F5F788FB0446214608A86E
 :100DA00014F016FD1FA10E20F6F7B0FF14F0CAFCD8
 :100DB000FEF7ECF900200749087007E0002005491C
 :100DC000087000210648F9F729FF00BF00BF0CB0EA
@@ -2896,8 +2896,8 @@
 :1014D00017490876F6F7BEFF18B117A10D20F6F7E9
 :1014E00015FC1348407E012820DD282101A8F4F7CF
 :1014F000D1FF282101A8F4F7CDFF1548007930B1BC
-:101500000B48427E13A101A8FBF7BCFC05E008488C
-:10151000427E16A101A8FBF7B5FC01A90D20F6F744
+:101500000B48427E13A101A8FBF7BEFC05E008488A
+:10151000427E16A101A8FBF7B7FC01A90D20F6F742
 :10152000F5FB10B900200249487600BF0BB000BDA2
 :101530004C520020AD3F00207361766520457272E9
 :101540005374617274436E74206661696C000000AC
@@ -4634,8 +4634,8 @@
 :10817000EBE70021034880F8481000BF00BF002053
 :10818000E3E70000A877002000B589B0202101A80E
 :10819000EEF780F91048006848B10F480FA1026857
-:1081A00001A8F4F76FFE01A91420EFF7AFFD104806
-:1081B000006848B10E480FA1026801A8F4F762FEFA
+:1081A00001A8F4F771FE01A91420EFF7AFFD104804
+:1081B000006848B10E480FA1026801A8F4F764FEF8
 :1081C00001A91420EFF7A2FD002003490860084927
 :1081D000086009B000BD0000DC4100207370695FD9
 :1081E00077726974655F6572722C25640D0A0000F0
@@ -4735,9 +4735,9 @@
 :1087C00002D04FF0FF30A2E700270448857300BFB6
 :1087D00001E000209BE7384699E70000347800204C
 :1087E00000B589B0202101A8EDF754FE10480068BB
-:1087F00048B10F480FA1026801A8F4F743FB01A993
+:1087F00048B10F480FA1026801A8F4F745FB01A991
 :108800001520EFF783FA1048006848B10E480FA111
-:10881000026801A8F4F736FB01A91520EFF776FAF4
+:10881000026801A8F4F738FB01A91520EFF776FAF2
 :108820000020034908600849086009B000BD000045
 :10883000F04100206969635F77726974655F6572F2
 :10884000722C25640D0A0000F44100206969635F01
@@ -4893,7 +4893,7 @@
 :1091A00020B13748D0F800142046884765E000F029
 :1091B000FFF8401C10BB0220314908700846D0F867
 :1091C000FC0328B10A46D2F8F803D2F8FC1388470A
-:1091D0002B482CA1D0F8F8233348F3F753FE32493B
+:1091D0002B482CA1D0F8F8233348F3F755FE324939
 :1091E0000620EEF793FD002000F064F8012000F067
 :1091F00061F800212D48F1F77BFC1DE02048D0F8F4
 :10920000F803401CC0B900201D4908700846D0F87A
@@ -4902,7 +4902,7 @@
 :1092300000211E48F1F75CFC1FE0FFE71C480068B6
 :1092400020B9F3F7DBFA1A49086015E0F3F7D6FA0C
 :1092500017490968401AB0F57A7F0DD3084809A16B
-:10926000D0F8F8231048F3F70DFE0F490620EEF76B
+:10926000D0F8F8231048F3F70FFE0F490620EEF769
 :109270004DFD00200E49086000BF00BF1CBD00006E
 :109280005C70002066726F6E745F696D755F7375D8
 :109290007370656E645F6F766572666C6F773A3077
@@ -5221,7 +5221,7 @@
 :10A620001030019000BF2E486DDF044600BF254664
 :10A630003DB100BF2BA24FF4DC712846EBF7EAFDD9
 :10A6400000BF00BF2E480078A0B92548807900904F
-:10A65000234843792B4A2CA12E48F2F713FC2948B2
+:10A65000234843792B4A2CA12E48F2F715FC2948B0
 :10A66000EBF723FF401D85B22A462A4901A87CDF6B
 :10A67000044608E02748EBF718FF85B22A4625492B
 :10A6800001A87CDF044600BF25463DB100BF15A2EE
@@ -5312,7 +5312,7 @@
 :10ABD000101A0846EBF772FE41EC1B0BF1F70EFE64
 :10ABE00006468DED0A8B8DED089B8DED06AB60481A
 :10ABF000006890F8210004908DED02BB2346324698
-:10AC00005DA167480095F2F73DF96649086002E0EA
+:10AC00005DA167480095F2F73FF96649086002E0E8
 :10AC1000654809F009FB634802786149624809F018
 :10AC2000B0FA0028F4D15F485D4902680020F0F7CF
 :10AC300085FC00205A495B4A126888540520EDF7CC
@@ -5325,7 +5325,7 @@
 :10ACA000101A0846EBF70AFE41EC1B0BF1F7A6FD64
 :10ACB00006468DED0A8B8DED089B8DED06AB2C487D
 :10ACC000006890F8210004908DED02BB23463246C7
-:10ACD00029A133480095F2F7D5F83249086002E01F
+:10ACD00029A133480095F2F7D7F83249086002E01D
 :10ACE000314809F0A1FA2F4802782D492E4809F081
 :10ACF00048FA0028F4D12B48294902680020F0F7CF
 :10AD00001DFC00202649274A126888540520ECF7CC
@@ -5841,14 +5841,14 @@
 :10CCE00000200490059006900790F2F773FA0F4821
 :10CCF000C17A827A437A90F83400CDE90132039107
 :10CD000000900A4890F8333090F8322008A104A827
-:10CD1000F0F7B8F804A8E9F7C8FB0446214604A8D0
+:10CD1000F0F7BAF804A8E9F7C8FB0446214604A8CE
 :10CD200008F056FD08F00EFD08B010BDBC51002003
 :10CD30002530325825303258253032582530325877
 :10CD400025303258253032580000000010B588B028
 :10CD5000002004900590069007900F4890F8371037
 :10CD600090F8362090F835000B4B1B7ACDE9003057
 :10CD7000CDE902210848C379827908A104A8F0F717
-:10CD800081F804A8E9F791FB0446214604A8FEF7C0
+:10CD800083F804A8E9F791FB0446214604A8FEF7BE
 :10CD9000E5FC08B010BD0000BC5100202530325821
 :10CDA0002530325825303258253032582530325807
 :10CDB00025303258000000007CB505460C4606239D
@@ -6296,12 +6296,12 @@
 :10E950002A48C07910B92948007A00B328480068CD
 :10E9600020B9EDF74BFF264908601CE0EDF746FFA4
 :10E9700023490968401AB0F57A7F14D321A12948A8
-:10E98000EEF780FA27490620E9F7C0F900201C4974
+:10E98000EEF782FA27490620E9F7C0F900201C4972
 :10E990000860F8F7BDF9F8F7E1F9FBF711FA02E0C2
 :10E9A00000201749086025BB1448007B00B31E48AF
 :10E9B000006820B9EDF722FF1B4908601CE0EDF765
 :10E9C0001DFF19490968401AB0F57A7F14D317A1C1
-:10E9D0001448EEF757FA13490620E9F797F9002093
+:10E9D0001448EEF759FA13490620E9F797F9002091
 :10E9E00011490860F9F756FEF9F774FEFBF7E8F9EC
 :10E9F00002E000200C49086070BD00005C7000203F
 :10EA0000BC40002046726F6E742053656E736F7247
@@ -7526,7 +7526,7 @@
 :10362000607923791C3CCDE90E30CDE910128DED87
 :103630000C8B8DED0A9B8DED08AB8DED06BB8DEDF2
 :1036400004CB8DED02DB8DED00EB53EC1F2B3DA188
-:1036500012A8E9F717FC0646324612A90020E7F740
+:1036500012A8E9F719FC0646324612A90020E7F73E
 :103660006DFF1C3595ED000A10EE101A0846E3F7C1
 :1036700025F941EC180B15ED010A10EE101A084659
 :10368000E3F71CF941EC190B15ED020A10EE101AC4
@@ -7539,7 +7539,7 @@
 :1036F00041EC1F0BE879A9796A792B791C3DCDE95A
 :103700000E32CDE910108DED0C8B8DED0A9B8DEDF9
 :1037100008AB8DED06BB8DED04CB8DED02DB8DEDA1
-:1037200000EB53EC1F2B07A112A8E9F7ABFB0646F1
+:1037200000EB53EC1F2B07A112A8E9F7ADFB0646EF
 :10373000324612A90020E7F701FF52B0BDEC108B12
 :1037400070BD000025662C25662C25662C25662C70
 :1037500025662C25662C25662C25662C25642C25B3

+ 4 - 4
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.htm

@@ -3,7 +3,7 @@
 <title>Static Call Graph - [.\_build\nrf52832_xxaa.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image .\_build\nrf52832_xxaa.axf</H1><HR>
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Wed Jul 27 18:51:15 2022
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Thu Jul 28 10:29:52 2022
 <BR><P>
 <H3>Maximum Stack Usage =       5152 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -6795,10 +6795,10 @@ Local Symbols
 <LI><a href="#[11b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__2sprintf
 <LI><a href="#[113]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;strlen
 </UL>
-<BR>[Address Reference Count : 4]<UL><LI> app_ota.o(i.cb_BLE_Client_R_DFU)
+<BR>[Address Reference Count : 4]<UL><LI> app_ota.o(i.app_ota_Process)
+<LI> app_ota.o(i.cb_BLE_Client_R_DFU)
 <LI> app_ota.o(i.cb_Client_BLE_DFU)
 <LI> app_ota.o(i.app_ota_Init)
-<LI> app_ota.o(i.app_ota_Process)
 </UL>
 <P><STRONG><a name="[6d]"></a>app_ota_clear_flash</STRONG> (Thumb, 104 bytes, Stack size 8 bytes, app_ota.o(i.app_ota_clear_flash))
 <BR><BR>[Stack]<UL><LI>Max Depth = 4624<LI>Call Chain = app_ota_clear_flash &rArr; Flash_SaveStep &rArr; Flash_SaveInfomation &rArr; pm_update &rArr; minfds_record_update &rArr; minfds_record_add &rArr; minfds_gc
@@ -10172,7 +10172,7 @@ Local Symbols
 <BR>[Called By]<UL><LI><a href="#[1b7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SEGGER_RTT_WriteNoLock
 </UL>
 
-<P><STRONG><a name="[1bb]"></a>_WriteBlocking</STRONG> (Thumb, 114 bytes, Stack size 32 bytes, segger_rtt.o(i._WriteBlocking))
+<P><STRONG><a name="[1bb]"></a>_WriteBlocking</STRONG> (Thumb, 118 bytes, Stack size 32 bytes, segger_rtt.o(i._WriteBlocking))
 <BR><BR>[Stack]<UL><LI>Max Depth = 32<LI>Call Chain = _WriteBlocking
 </UL>
 <BR>[Calls]<UL><LI><a href="#[115]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memcpy

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 13 - 13
pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvguix.Administrator


+ 4 - 4
pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvprojx

@@ -6144,8 +6144,8 @@
     <files>
       <file attr="config" category="source" condition="ARM Compiler" name="Device\Source\arm\arm_startup_nrf52.s" version="8.32.1">
         <instance index="0">RTE\Device\nRF52832_xxAA\arm_startup_nrf52.s</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.35.0" condition="nRF52832 Device and CMSIS"/>
-        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.35.0"/>
+        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.32.1" condition="nRF52832 Device and CMSIS"/>
+        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.32.1"/>
         <targetInfos>
           <targetInfo name="Shoes_FW_APP"/>
           <targetInfo excluded="1" name="flash_s132_nrf52_7.0.1_softdevice"/>
@@ -6153,8 +6153,8 @@
       </file>
       <file attr="config" category="source" name="Device\Source\system_nrf52.c" version="8.32.1">
         <instance index="0">RTE\Device\nRF52832_xxAA\system_nrf52.c</instance>
-        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.35.0" condition="nRF52832 Device and CMSIS"/>
-        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.35.0"/>
+        <component Cclass="Device" Cgroup="Startup" Cvendor="NordicSemiconductor" Cversion="8.32.1" condition="nRF52832 Device and CMSIS"/>
+        <package license="License/license.txt" name="nRF_DeviceFamilyPack" schemaVersion="1.3" url="http://developer.nordicsemi.com/nRF5_SDK/pieces/nRF_DeviceFamilyPack/" vendor="NordicSemiconductor" version="8.32.1"/>
         <targetInfos>
           <targetInfo name="Shoes_FW_APP"/>
           <targetInfo excluded="1" name="flash_s132_nrf52_7.0.1_softdevice"/>

+ 1 - 1
system/usr_config.h

@@ -5,7 +5,7 @@
 #define SHOES_NAME "SMART SHOE"
 #define SHOES_NAME_LEN  64
 #define HARDWARE_VERSION	0x00010301
-#define SOFTWARE_VERSION	0x0008
+#define SOFTWARE_VERSION	0x0009
 
 // <h> ¹«¹²
 

+ 3 - 1
版本更新记录.txt

@@ -1 +1,3 @@
-1. 更新日常计步算法
+1.  添加FIFO溢出上报
+2.  修复下蹲的bug
+3.  添加前后脚压力值统计上报

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä