Ouj_Junchao преди 2 години
родител
ревизия
0cc284428b

+ 4 - 3
ble_cfg/host.c

@@ -478,13 +478,14 @@ static void ble_evt_handler(ble_evt_t const *p_ble_evt, void *p_context)
 				if(p_gap_evt->params.scan_req_report.peer_addr.addr[4] == ver1 && p_gap_evt->params.scan_req_report.peer_addr.addr[3] == ver2)
 				{	
 					uint8_t cmd = (p_gap_evt->params.scan_req_report.peer_addr.addr[5] & 0x3f);
-//					SEGGER_RTT_printf(0,"222 cmd:%d\r\n",cmd);
+//					SEGGER_RTT_printf(0,">>>>>>>>>>>> rssi:%d\r\n",p_gap_evt->params.scan_req_report.rssi);
 					switch(cmd){
 						case 0x01:{
+							   if(p_gap_evt->params.scan_req_report.rssi <= -50)break;
 								 uint16_t softversion = (uint16_t)(p_gap_evt->params.scan_req_report.peer_addr.addr[2]<<8 | p_gap_evt->params.scan_req_report.peer_addr.addr[1]);
 								 if(SOFTWARE_VERSION == softversion){
 										LED_Start(LED_ONPURPLE,COLOR_PURPLE);
-										led_cnt =600;
+										led_cnt =10;
 										Process_SetHoldOn(app_BLE_LEDON_PURPLE_process,1);
 									 
 										selfcheck_trigger_set_order(p_gap_evt->params.scan_req_report.peer_addr.addr[0]);
@@ -494,7 +495,7 @@ static void ble_evt_handler(ble_evt_t const *p_ble_evt, void *p_context)
 								 if(0x02 == p_gap_evt->params.scan_req_report.peer_addr.addr[1] && LR_FLAG_VALUE == mFlash.LR_FLAG){//查询左右鞋
 										if(mFlash.isHost)LED_Start(LED_LR_LED,COLOR_CYAN);
 										else LED_Start(LED_LR_LED,COLOR_YELLOW);
-										led_cnt =600;
+										led_cnt =10;
 										Process_SetHoldOn(app_BLE_LEDON_PURPLE_process,1);
 								 }
 //									 else if(0x00 == p_gap_evt->params.scan_req_report.peer_addr.addr[1] && LR_FLAG_VALUE == mFlash.LR_FLAG){//清除左右鞋的配置

+ 1 - 1
build_log.txt

@@ -3,4 +3,4 @@ Build started: Project: ble_app_uart_c_pca10040_s132
 Build target 'Shoes_FW_APP'
 FromELF: creating hex file...
 ÿþ".\_build\nrf52832_xxaa.axf" - 0 Error(s), 0 Warning(s).
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:02

BIN
dfu_readme/app_dfu_package_20221012_V1.4.48.zip → dfu_readme/app_dfu_package.zip


+ 8 - 8
dfu_readme/app_setting.hex

@@ -1,6 +1,6 @@
 :020000040007F3
-:10E00000BDFB234C020000000100000001000000E5
-:10E010000000000000000000582002005D1A295F87
+:10E00000EECD5A2C020000000100000001000000CB
+:10E01000000000000000000068190200AEB5417762
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -36,12 +36,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000819AD7A725
+:10E25000000000000000000000000000DEDFA4BAA3
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A00000015D1A295F000000000000000000006E
+:10E2A0000001AEB541770000000000000000000052
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -50,8 +50,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000BDFB234C020000000100000001000000D5
-:10F010000000000000000000582002005D1A295F77
+:10F00000EECD5A2C020000000100000001000000BB
+:10F01000000000000000000068190200AEB5417752
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -87,12 +87,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000819AD7A715
+:10F25000000000000000000000000000DEDFA4BA93
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A00000015D1A295F000000000000000000005E
+:10F2A0000001AEB541770000000000000000000042
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

Файловите разлики са ограничени, защото са твърде много
+ 8536 - 8647
dfu_readme/app_setting_sd_boot.hex


+ 8 - 8
dfu_readme/setting_sd_boot.hex

@@ -11063,8 +11063,8 @@
 :10DF600000000000000000000000000000000000B1
 :10DF7000000000000090D00300000000000000003E
 :0CDF800085A6070000100000000008004B
-:10E00000BDFB234C020000000100000001000000E5
-:10E010000000000000000000582002005D1A295F87
+:10E00000EECD5A2C020000000100000001000000CB
+:10E01000000000000000000068190200AEB5417762
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -11100,12 +11100,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000819AD7A725
+:10E25000000000000000000000000000DEDFA4BAA3
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A00000015D1A295F000000000000000000006E
+:10E2A0000001AEB541770000000000000000000052
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -11114,8 +11114,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000BDFB234C020000000100000001000000D5
-:10F010000000000000000000582002005D1A295F77
+:10F00000EECD5A2C020000000100000001000000BB
+:10F01000000000000000000068190200AEB5417752
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -11151,12 +11151,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000819AD7A715
+:10F25000000000000000000000000000DEDFA4BA93
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A00000015D1A295F000000000000000000005E
+:10F2A0000001AEB541770000000000000000000042
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

+ 0 - 130
pca10040/s132/arm5_no_packs/JLinkLog.txt

@@ -1,130 +0,0 @@
-T25A8 000:345.282   SEGGER J-Link V7.56a Log File
-T25A8 000:345.516   DLL Compiled: Oct 11 2021 16:27:21
-T25A8 000:345.538   Logging started @ 2022-10-12 08:03
-T25A8 000:345.557 - 345.567ms
-T25A8 000:345.593 JLINK_SetWarnOutHandler(...)
-T25A8 000:345.614 - 0.030ms
-T25A8 000:345.634 JLINK_OpenEx(...)
-T25A8 000:348.270   Firmware: J-Link V9 compiled May  7 2021 16:26:12
-T25A8 000:348.659   Firmware: J-Link V9 compiled May  7 2021 16:26:12
-T25A8 000:348.921   Decompressing FW timestamp took 176 us
-T25A8 000:354.942   Hardware: V9.20
-T25A8 000:355.028   S/N: 59800885
-T25A8 000:355.074   OEM: SEGGER
-T25A8 000:355.105   Feature(s): RDI, GDB, FlashDL, FlashBP, JFlash
-T25A8 000:356.278   TELNET listener socket opened on port 19021
-T25A8 000:356.790   WEBSRV WEBSRV_Init(): Starting webserver thread(s)
-T25A8 000:356.950   WEBSRV Webserver running on local port 19080
-T25A8 000:474.970 - 129.355ms returns "O.K."
-T25A8 000:475.028 JLINK_GetEmuCaps()
-T25A8 000:475.036 - 0.012ms returns 0xB9FF7BBF
-T25A8 000:475.053 JLINK_TIF_GetAvailable(...)
-T25A8 000:475.225 - 0.181ms
-T25A8 000:475.248 JLINK_SetErrorOutHandler(...)
-T25A8 000:475.259 - 0.017ms
-T25A8 000:475.303 JLINK_ExecCommand("ProjectFile = "D:\Git_Project\shoes\smart_shoes\nRF5_SDK_17.0.0_9d13099\examples\Shoes1.4\shoe_mcu20221012V1.4.45\pca10040\s132\arm5_no_packs\JLinkSettings.ini"", ...). 
-T25A8 000:490.417   Ref file found at: C:\Keil_v5\ARM\Segger\JLinkDevices.ref
-T25A8 000:490.563   XML referenced by ref file: C:\Program Files\SEGGER\JLink\JLinkDevices.xml
-T25A8 000:491.578   C:\Program Files\SEGGER\JLink\JLinkDevices.xml evaluated successfully.
-T25A8 000:550.244 - 74.958ms returns 0x00
-T25A8 000:550.334 JLINK_ExecCommand("Device = nRF52832_xxAA", ...). 
-T25A8 000:550.693   Device "NRF52832_XXAA" selected.
-T25A8 000:551.013 - 0.670ms returns 0x00
-T25A8 000:551.029 JLINK_ExecCommand("DisableConnectionTimeout", ...). 
-T25A8 000:551.040 - 0.005ms returns 0x01
-T25A8 000:551.048 JLINK_GetHardwareVersion()
-T25A8 000:551.053 - 0.008ms returns 92000
-T25A8 000:551.061 JLINK_GetDLLVersion()
-T25A8 000:551.067 - 0.008ms returns 75601
-T25A8 000:551.074 JLINK_GetOEMString(...)
-T25A8 000:551.081 JLINK_GetFirmwareString(...)
-T25A8 000:551.087 - 0.008ms
-T25A8 000:551.097 JLINK_GetDLLVersion()
-T25A8 000:551.102 - 0.008ms returns 75601
-T25A8 000:551.109 JLINK_GetCompileDateTime()
-T25A8 000:551.115 - 0.008ms
-T25A8 000:551.125 JLINK_GetFirmwareString(...)
-T25A8 000:551.131 - 0.017ms
-T25A8 000:551.149 JLINK_GetHardwareVersion()
-T25A8 000:551.154 - 0.008ms returns 92000
-T25A8 000:551.163 JLINK_GetSN()
-T25A8 000:551.169 - 0.009ms returns 59800885
-T25A8 000:551.177 JLINK_GetOEMString(...)
-T25A8 000:551.194 JLINK_TIF_Select(JLINKARM_TIF_SWD)
-T25A8 000:551.729 - 0.542ms returns 0x00
-T25A8 000:551.744 JLINK_HasError()
-T25A8 000:551.760 JLINK_SetSpeed(5000)
-T25A8 000:551.831 - 0.077ms
-T25A8 000:552.297 JLINK_HasError()
-T25A8 000:552.311 JLINK_SetResetType(JLINKARM_RESET_TYPE_NORMAL)
-T25A8 000:552.318 - 0.009ms returns JLINKARM_RESET_TYPE_NORMAL
-T25A8 000:552.326 JLINK_Reset()
-T25A8 000:552.483   InitTarget() start
-T25A8 000:552.494    J-Link Script File: Executing InitTarget()
-T25A8 000:554.175   InitTarget() end
-T25A8 000:554.654   Found SW-DP with ID 0x2BA01477
-T25A8 000:556.382   DPIDR: 0x2BA01477
-T25A8 000:556.409   Scanning AP map to find all available APs
-T25A8 000:557.127   AP[2]: Stopped AP scan as end of AP map has been reached
-T25A8 000:557.154   AP[0]: AHB-AP (IDR: 0x24770011)
-T25A8 000:557.168   AP[1]: JTAG-AP (IDR: 0x02880000)
-T25A8 000:557.180   Iterating through AP map to find AHB-AP to use
-T25A8 000:557.834   AP[0]: Core found
-T25A8 000:557.853   AP[0]: AHB-AP ROM base: 0xE00FF000
-T25A8 000:558.187   CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
-T25A8 000:558.204   Found Cortex-M4 r0p1, Little endian.
-T25A8 000:659.301   -- Max. mem block: 0x00010C20
-T25A8 000:659.464   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T25A8 000:659.762   CPU_ReadMem(4 bytes @ 0xE0002000)
-T25A8 000:660.033   FPUnit: 6 code (BP) slots and 2 literal slots
-T25A8 000:660.140   CPU_ReadMem(4 bytes @ 0xE000EDFC)
-T25A8 000:660.400   CPU_ReadMem(4 bytes @ 0xE0001000)
-T25A8 000:660.655   CPU_WriteMem(4 bytes @ 0xE0001000)
-T25A8 000:660.944   CPU_ReadMem(4 bytes @ 0xE000ED88)
-T25A8 000:661.274   CPU_WriteMem(4 bytes @ 0xE000ED88)
-T25A8 000:661.522   CPU_ReadMem(4 bytes @ 0xE000ED88)
-T25A8 000:661.797   CPU_WriteMem(4 bytes @ 0xE000ED88)
-T25A8 000:662.125   CoreSight components:
-T25A8 000:662.147   ROMTbl[0] @ E00FF000
-T25A8 000:662.166   CPU_ReadMem(64 bytes @ 0xE00FF000)
-T25A8 000:662.657   CPU_ReadMem(32 bytes @ 0xE000EFE0)
-T25A8 000:663.023   [0][0]: E000E000 CID B105E00D PID 000BB00C SCS-M7
-T25A8 000:663.044   CPU_ReadMem(32 bytes @ 0xE0001FE0)
-T25A8 000:663.429   [0][1]: E0001000 CID B105E00D PID 003BB002 DWT
-T25A8 000:663.449   CPU_ReadMem(32 bytes @ 0xE0002FE0)
-T25A8 000:663.808   [0][2]: E0002000 CID B105E00D PID 002BB003 FPB
-T25A8 000:663.829   CPU_ReadMem(32 bytes @ 0xE0000FE0)
-T25A8 000:664.195   [0][3]: E0000000 CID B105E00D PID 003BB001 ITM
-T25A8 000:664.217   CPU_ReadMem(32 bytes @ 0xE0040FE0)
-T25A8 000:664.605   [0][4]: E0040000 CID B105900D PID 000BB9A1 TPIU
-T25A8 000:664.629   CPU_ReadMem(32 bytes @ 0xE0041FE0)
-T25A8 000:664.999   [0][5]: E0041000 CID B105900D PID 000BB925 ETM
-T25A8 000:665.097   CPU is running
-T25A8 000:665.114   CPU_WriteMem(4 bytes @ 0xE000EDF0)
-T25A8 000:665.365   CPU is running
-T25A8 000:665.385   CPU_WriteMem(4 bytes @ 0xE000EDFC)
-T25A8 000:665.632   Reset: Halt core after reset via DEMCR.VC_CORERESET.
-T25A8 000:665.958   Reset: Reset device via AIRCR.SYSRESETREQ.
-T25A8 000:665.979   CPU is running
-T25A8 000:665.990   CPU_WriteMem(4 bytes @ 0xE000ED0C)
-T25A8 000:718.361   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T25A8 000:718.630   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T25A8 000:718.882   CPU is running
-T25A8 000:718.898   CPU_WriteMem(4 bytes @ 0xE000EDF0)
-T25A8 000:719.166   CPU is running
-T25A8 000:719.188   CPU_WriteMem(4 bytes @ 0xE000EDFC)
-T25A8 000:724.954   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T25A8 000:727.240   CPU_WriteMem(4 bytes @ 0xE0002000)
-T25A8 000:727.526   CPU_ReadMem(4 bytes @ 0xE000EDFC)
-T25A8 000:727.796   CPU_ReadMem(4 bytes @ 0xE0001000)
-T25A8 000:728.132 - 175.815ms
-T25A8 000:728.155 JLINK_GetId()
-T25A8 000:728.329 - 0.302ms returns 0x2BA01477
-T25A8 000:737.824 JLINK_GetFirmwareString(...)
-T25A8 000:737.854 - 0.035ms
-T25A8 001:403.287 JLINK_Close()
-T25A8 001:403.640   CPU_ReadMem(4 bytes @ 0xE0001000)
-T25A8 001:403.946   CPU_WriteMem(4 bytes @ 0xE0001004)
-T25A8 001:433.418 - 30.145ms
-T25A8 001:433.436   
-T25A8 001:433.441   Closed

Файловите разлики са ограничени, защото са твърде много
+ 2 - 2
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


+ 62 - 6
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.build_log.htm

@@ -21,14 +21,70 @@ Target DLL:      Segger\JL2CM3.dll V2.99.38.0
 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.4\shoe_mcu20221012V1.4.45\pca10040\s132\arm5_no_packs\ble_app_uart_c_pca10040_s132.uvprojx
+D:\Git_Project\shoes\smart_shoes\nRF5_SDK_17.0.0_9d13099\examples\Shoes1.4\shoe_mcu\pca10040\s132\arm5_no_packs\ble_app_uart_c_pca10040_s132.uvprojx
 Project File Date:  10/11/2022
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'Shoes_FW_APP'
+compiling system.c...
+compiling app_client_step.c...
+compiling exception.c...
+compiling app_host.c...
+compiling app_overturn.c...
+compiling usr.c...
+compiling selfcheck.c...
+compiling app_step.c...
+compiling app_switchimu.c...
+compiling app_game.c...
+compiling app_client.c...
+compiling app_ota.c...
+compiling app_losspack.c...
+compiling app_connect_manage.c...
+compiling app_math.c...
+compiling app_flash.c...
+compiling app_power.c...
+compiling app_Authen.c...
+compiling app_data_transfer.c...
+compiling app_charge.c...
+compiling app_detectIsHost.c...
+compiling app_safe.c...
+..\..\..\app\app_safe.c(132): warning:  #177-D: variable "cnt"  was declared but never referenced
+  	 static uint8_t cnt =0;
+..\..\..\app\app_safe.c: 1 warning, 0 errors
+compiling hal_mt.c...
+compiling bll_imu.c...
+compiling app_one_wire.c...
+compiling hal_wearshoes.c...
+compiling fml_imu.c...
+compiling app_pair.c...
+compiling hal_battery_NoPowerEnPin.c...
+compiling hal_qma.c...
+compiling bsp_wdt.c...
+compiling bsp_pwm.c...
+compiling bsp_time.c...
+compiling fml_adc.c...
+compiling bsp_adc.c...
+..\..\..\bsp\bsp_adc.c(89): warning:  #550-D: variable "ret"  was set but never used
+  	int 				ret = 0;
+..\..\..\bsp\bsp_adc.c: 1 warning, 0 errors
+compiling hal_charge.c...
+compiling bsp_flash.c...
+compiling drv_qmc6310_v2.c...
+compiling bsp_spi.c...
+compiling drv_lsm6ds3tr_c.c...
+compiling process_result.c...
+compiling slave.c...
+compiling host.c...
+..\..\..\ble_cfg\host.c(447): warning:  #177-D: variable "p_connected_evt"  was declared but never referenced
+  		ble_gap_evt_connected_t const * p_connected_evt = &p_gap_evt->params.connected;
+..\..\..\ble_cfg\host.c: 1 warning, 0 errors
+compiling ble_dfu_unbonded.c...
+compiling detect_zero_vel.c...
+linking...
+Program Size: Code=134016 RO-data=3184 RW-data=3388 ZI-data=27208  
 FromELF: creating hex file...
-".\_build\nrf52832_xxaa.axf" - 0 Error(s), 0 Warning(s).
+".\_build\nrf52832_xxaa.axf" - 0 Error(s), 3 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -54,11 +110,11 @@ Package Vendor: NordicSemiconductor
    * Component: ARM::CMSIS:CORE:5.3.0
 
    * Component: NordicSemiconductor::Device:Startup:8.32.1
-      Source file:   Device\Source\system_nrf52.c
-      Include file:  Device\Include\system_nrf52.h
-      Source file:   Device\Source\arm\arm_startup_nrf52.s
       Include file:  Device\Include\system_nrf.h
-Build Time Elapsed:  00:00:01
+      Source file:   Device\Source\arm\arm_startup_nrf52.s
+      Include file:  Device\Include\system_nrf52.h
+      Source file:   Device\Source\system_nrf52.c
+Build Time Elapsed:  00:00:21
 </pre>
 </body>
 </html>

Файловите разлики са ограничени, защото са твърде много
+ 257 - 257
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.hex


+ 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 Oct 12 16:56:14 2022
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Thu Oct 13 11:23:56 2022
 <BR><P>
 <H3>Maximum Stack Usage =       5240 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -8088,8 +8088,8 @@ Local Symbols
 <BR>[Calls]<UL><LI><a href="#[265]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Process_Stop
 <LI><a href="#[124]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Except_TxError
 </UL>
-<BR>[Address Reference Count : 2]<UL><LI> bsp_pwm.o(i.Pwm_init)
-<LI> bsp_pwm.o(i.bsp_pwm_init_process)
+<BR>[Address Reference Count : 2]<UL><LI> bsp_pwm.o(i.bsp_pwm_init_process)
+<LI> bsp_pwm.o(i.Pwm_init)
 </UL>
 <P><STRONG><a name="[b8]"></a>WatchDog_Process</STRONG> (Thumb, 8 bytes, Stack size 8 bytes, bsp_wdt.o(i.WatchDog_Process))
 <BR><BR>[Stack]<UL><LI>Max Depth = 24<LI>Call Chain = WatchDog_Process &rArr; feed_watchdog &rArr; nrfx_wdt_channel_feed
@@ -9066,7 +9066,7 @@ Local Symbols
 <BR>[Called By]<UL><LI><a href="#[492]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;slave_init
 </UL>
 
-<P><STRONG><a name="[c8]"></a>ble_evt_handler</STRONG> (Thumb, 370 bytes, Stack size 64 bytes, host.o(i.ble_evt_handler))
+<P><STRONG><a name="[c8]"></a>ble_evt_handler</STRONG> (Thumb, 378 bytes, Stack size 64 bytes, host.o(i.ble_evt_handler))
 <BR><BR>[Stack]<UL><LI>Max Depth = 4936<LI>Call Chain = ble_evt_handler &rArr; on_ble_peripheral_evt &rArr; multi_qwr_conn_handle_assign &rArr; app_error_handler &rArr; app_error_fault_handler &rArr; Flash_SaveLog &rArr; Flash_SaveInfomation &rArr; pm_update &rArr; minfds_record_update &rArr; minfds_record_add &rArr; minfds_gc
 </UL>
 <BR>[Calls]<UL><LI><a href="#[106]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Process_SetHoldOn

Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvguix.Administrator


+ 1 - 1
system/exception.h

@@ -26,7 +26,7 @@ typedef struct
 	char chargeV2P_f_init;
 	char Voltage2power_init;
 } battercb_t;
-
+//EXCEPT分级 : 0~100 正常通知;100~150 警告 150以上 错误{}错误会通过企业微信推送
 typedef enum {
 	//数据异常
 	EXCEPT_DATA_BACK_MAG =0,				//异常 —— 后脚地磁数据

+ 1 - 1
system/usr_config.h

@@ -5,7 +5,7 @@
 #define SHOES_NAME "FUN SHOE"
 #define SHOES_NAME_LEN  64
 #define HARDWARE_VERSION	0x00010401
-#define SOFTWARE_VERSION	0x0030
+#define SOFTWARE_VERSION	0x0031
 
 #if SOFTWARE_VERSION <= 0x0000
 #error "SOFTWARE VERSION must be > 0"

+ 2 - 4
版本更新记录.txt

@@ -1,4 +1,2 @@
-1.  完善自检
-2.  完善配对功能
-3.  将名字前缀由SH_改成FUN_
-4.  添加手机发送常亮紫色灯的接口
+1.  将亮紫色灯的时间改成10秒
+2.  增加进入自检的条件,信号强度< -50

Някои файлове не бяха показани, защото твърде много файлове са промени