Ouj_Junchao 2 år sedan
förälder
incheckning
d77a257701

BIN
dfu_readme/app_dfu_package.zip


+ 8 - 8
dfu_readme/app_setting.hex

@@ -1,6 +1,6 @@
 :020000040007F3
-:10E0000060E644770200000001000000010000000B
-:10E010000000000000000000D4100200CDAAC64F8E
+:10E00000F289035F0200000001000000010000002F
+:10E010000000000000000000B80F0200E5D6CA4969
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -36,12 +36,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E2500000000000000000000000000085C96CAC58
+:10E25000000000000000000000000000ECC55D6947
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A0000001CDAAC64F00000000000000000000E1
+:10E2A0000001E5D6CA49000000000000000000009F
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -50,8 +50,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F0000060E64477020000000100000001000000FB
-:10F010000000000000000000D4100200CDAAC64F7E
+:10F00000F289035F0200000001000000010000001F
+:10F010000000000000000000B80F0200E5D6CA4959
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -87,12 +87,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F2500000000000000000000000000085C96CAC48
+:10F25000000000000000000000000000ECC55D6937
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A0000001CDAAC64F00000000000000000000D1
+:10F2A0000001E5D6CA49000000000000000000008F
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 255 - 255
dfu_readme/app_setting_sd_boot.hex


+ 8 - 8
dfu_readme/setting_sd_boot.hex

@@ -11063,8 +11063,8 @@
 :10DF600000000000000000000000000000000000B1
 :10DF7000000000000090D00300000000000000003E
 :0CDF800085A6070000100000000008004B
-:10E0000060E644770200000001000000010000000B
-:10E010000000000000000000D4100200CDAAC64F8E
+:10E00000F289035F0200000001000000010000002F
+:10E010000000000000000000B80F0200E5D6CA4969
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -11100,12 +11100,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E2500000000000000000000000000085C96CAC58
+:10E25000000000000000000000000000ECC55D6947
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A0000001CDAAC64F00000000000000000000E1
+:10E2A0000001E5D6CA49000000000000000000009F
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -11114,8 +11114,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F0000060E64477020000000100000001000000FB
-:10F010000000000000000000D4100200CDAAC64F7E
+:10F00000F289035F0200000001000000010000001F
+:10F010000000000000000000B80F0200E5D6CA4959
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -11151,12 +11151,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F2500000000000000000000000000085C96CAC48
+:10F25000000000000000000000000000ECC55D6937
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A0000001CDAAC64F00000000000000000000D1
+:10F2A0000001E5D6CA49000000000000000000008F
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 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


+ 2 - 2
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.build_log.htm

@@ -22,7 +22,7 @@ Dialog DLL:      TCM.DLL V1.42.0.0
  
 <h2>Project:</h2>
 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/18/2022
+Project File Date:  07/27/2022
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
@@ -56,8 +56,8 @@ Package Vendor: NordicSemiconductor
    * Component: NordicSemiconductor::Device:Startup:8.32.1
       Source file:   Device\Source\arm\arm_startup_nrf52.s
       Source file:   Device\Source\system_nrf52.c
-      Include file:  Device\Include\system_nrf.h
       Include file:  Device\Include\system_nrf52.h
+      Include file:  Device\Include\system_nrf.h
 Build Time Elapsed:  00:00:02
 </pre>
 </body>

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 255 - 255
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.hex


+ 7 - 14
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: Tue Jul 26 10:38:06 2022
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Wed Jul 27 14:40:01 2022
 <BR><P>
 <H3>Maximum Stack Usage =       5152 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -746,8 +746,7 @@ Global Symbols
 </UL>
 <BR>[Calls]<UL><LI><a href="#[d1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
 </UL>
-<BR>[Called By]<UL><LI><a href="#[255]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;detect_step_by_mag
-<LI><a href="#[1af]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;RealTimeStep
+<BR>[Called By]<UL><LI><a href="#[1af]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;RealTimeStep
 <LI><a href="#[216]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__ieee754_rem_pio2
 <LI><a href="#[208]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__kernel_poly
 <LI><a href="#[207]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__mathlib_dbl_underflow
@@ -776,8 +775,7 @@ Global Symbols
 </UL>
 <BR>[Calls]<UL><LI><a href="#[d1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_double_epilogue
 </UL>
-<BR>[Called By]<UL><LI><a href="#[255]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;detect_step_by_mag
-<LI><a href="#[1af]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;RealTimeStep
+<BR>[Called By]<UL><LI><a href="#[1af]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;RealTimeStep
 <LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;chargerpin_one_ms_pcs
 <LI><a href="#[62]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;app_detect_LR_Porcess
 <LI><a href="#[216]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__ieee754_rem_pio2
@@ -836,7 +834,6 @@ Global Symbols
 <P><STRONG><a name="[10c]"></a>__aeabi_cdrcmple</STRONG> (Thumb, 48 bytes, Stack size 0 bytes, cdrcmple.o(.text))
 <BR><BR>[Called By]<UL><LI><a href="#[2da]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;slave_update_conn_interval_request
 <LI><a href="#[10a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Ble_update_conn_interval
-<LI><a href="#[255]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;detect_step_by_mag
 <LI><a href="#[1af]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;RealTimeStep
 <LI><a href="#[73]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;chargerpin_one_ms_pcs
 <LI><a href="#[21a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;_fp_digits
@@ -3716,12 +3713,8 @@ Global Symbols
 <BR><BR>[Called By]<UL><LI><a href="#[42]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;integrate_left_right
 </UL>
 
-<P><STRONG><a name="[255]"></a>detect_step_by_mag</STRONG> (Thumb, 660 bytes, Stack size 64 bytes, detect_step_by_mag.o(i.detect_step_by_mag))
-<BR><BR>[Stack]<UL><LI>Max Depth = 152<LI>Call Chain = detect_step_by_mag &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
-</UL>
-<BR>[Calls]<UL><LI><a href="#[10c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_cdrcmple
-<LI><a href="#[d7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_i2d
-<LI><a href="#[d5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_dmul
+<P><STRONG><a name="[255]"></a>detect_step_by_mag</STRONG> (Thumb, 408 bytes, Stack size 36 bytes, detect_step_by_mag.o(i.detect_step_by_mag))
+<BR><BR>[Stack]<UL><LI>Max Depth = 36<LI>Call Chain = detect_step_by_mag
 </UL>
 <BR>[Called By]<UL><LI><a href="#[7c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;app_math_DailyStep_Process
 </UL>
@@ -4258,7 +4251,7 @@ Global Symbols
 <LI><a href="#[a8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;WatchDog_Process
 </UL>
 
-<P><STRONG><a name="[2f1]"></a>find_acc_max_and_min_val</STRONG> (Thumb, 70 bytes, Stack size 20 bytes, detect_zero_vel.o(i.find_acc_max_and_min_val))
+<P><STRONG><a name="[2f1]"></a>find_acc_max_and_min_val</STRONG> (Thumb, 72 bytes, Stack size 20 bytes, detect_zero_vel.o(i.find_acc_max_and_min_val))
 <BR><BR>[Stack]<UL><LI>Max Depth = 20<LI>Call Chain = find_acc_max_and_min_val
 </UL>
 <BR>[Called By]<UL><LI><a href="#[2f0]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;detect_zero_vel
@@ -6652,7 +6645,7 @@ Local Symbols
 <BR>[Address Reference Count : 1]<UL><LI> app_client_step.o(.data)
 </UL>
 <P><STRONG><a name="[7c]"></a>app_math_DailyStep_Process</STRONG> (Thumb, 146 bytes, Stack size 56 bytes, app_step.o(i.app_math_DailyStep_Process))
-<BR><BR>[Stack]<UL><LI>Max Depth = 208<LI>Call Chain = app_math_DailyStep_Process &rArr; detect_step_by_mag &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
+<BR><BR>[Stack]<UL><LI>Max Depth = 92<LI>Call Chain = app_math_DailyStep_Process &rArr; detect_step_by_mag
 </UL>
 <BR>[Calls]<UL><LI><a href="#[1f9]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;hal_wearshoes_is_wearshoes
 <LI><a href="#[255]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;detect_step_by_mag

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvguix.Administrator


+ 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	0x0007
+#define SOFTWARE_VERSION	0x0008
 
 // <h> ¹«¹²
 

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

@@ -1,7 +1 @@
-1. 屏蔽左右鞋 鉴权的功能
-2. 优化IMU BUFF数据堆满的问题
-3. 解决发送DFU之后,右鞋广播名字不对的情况
-4. 解决左鞋线程 Hold的问题
-5. 优化垫脚显示
-6. 优化算法
-7..
+1. 更新算法

Vissa filer visades inte eftersom för många filer har ändrats