Browse Source

添加1.2.12版本

Ouj_Junchao 2 years ago
parent
commit
b23b9092e0

+ 3 - 3
app/app_game.c

@@ -104,7 +104,7 @@ static void process_imu_data_front(int front_index)
 		
 		if(dt < 0)
 		{
-			dt = -dt;
+			dt = 2425;
 		}
 		
 		timestamp += dt;
@@ -273,8 +273,8 @@ static void app_game_Process(void)
 								bll_imu_Resume_unregister_config_param(&game_bll_imu_param_t);
 								if(mFlash.isHost)app_game_notify_host(0);
 
-							  Except_TxError(EXCEPT_GAME,"!!!!!set_pdr_status");
-							  DEBUG_LOG("\r\n!!!!!set_pdr_status\r\n");
+//							  Except_TxError(EXCEPT_GAME,"!!!!!set_pdr_status");
+//							  DEBUG_LOG("\r\n!!!!!set_pdr_status\r\n");
 								IMU_STATUS = 0;
 								set_pdr_status();
 								app_game_led(0);

+ 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:02
+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
-:10E00000E329540A020000000100000001000000A2
-:10E010000000000000000000DC6F02002507376CE4
+:10E00000CF2D2F33020000000100000001000000AE
+:10E010000000000000000000AC5F02008178077083
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -36,12 +36,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E250000000000000000000000000001BFE907E97
+:10E2500000000000000000000000000064ABF76058
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A00000012507376C000000000000000000009E
+:10E2A00000018178077000000000000000000000FD
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -50,8 +50,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000E329540A02000000010000000100000092
-:10F010000000000000000000DC6F02002507376CD4
+:10F00000CF2D2F330200000001000000010000009E
+:10F010000000000000000000AC5F02008178077073
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -87,12 +87,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F250000000000000000000000000001BFE907E87
+:10F2500000000000000000000000000064ABF76048
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A00000012507376C000000000000000000008E
+:10F2A00000018178077000000000000000000000ED
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

File diff suppressed because it is too large
+ 280 - 280
dfu_readme/app_setting_sd_boot.hex


BIN
dfu_readme/bootloader_dfu_package.zip


+ 8 - 8
dfu_readme/setting_sd_boot.hex

@@ -11063,8 +11063,8 @@
 :10DF600000000000000000000000000000000000B1
 :10DF7000000000000090D00300000000000000003E
 :0CDF800085A6070000100000000008004B
-:10E00000E329540A020000000100000001000000A2
-:10E010000000000000000000DC6F02002507376CE4
+:10E00000CF2D2F33020000000100000001000000AE
+:10E010000000000000000000AC5F02008178077083
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -11100,12 +11100,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E250000000000000000000000000001BFE907E97
+:10E2500000000000000000000000000064ABF76058
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A00000012507376C000000000000000000009E
+:10E2A00000018178077000000000000000000000FD
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -11114,8 +11114,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000E329540A02000000010000000100000092
-:10F010000000000000000000DC6F02002507376CD4
+:10F00000CF2D2F330200000001000000010000009E
+:10F010000000000000000000AC5F02008178077073
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -11151,12 +11151,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F250000000000000000000000000001BFE907E87
+:10F2500000000000000000000000000064ABF76048
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A00000012507376C000000000000000000008E
+:10F2A00000018178077000000000000000000000ED
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

+ 8 - 0
drivers/drv_qma7981.c

@@ -396,6 +396,9 @@ int drv_qma_Init(void)
 	nrf_gpio_cfg_output(PIN_QMA7981_AD0);
 	nrf_gpio_pin_write(PIN_QMA7981_AD0,ADO);
 	
+	nrf_gpio_cfg_output(PIN_QMA7981_nCS);
+	nrf_gpio_pin_write(PIN_QMA7981_nCS,1);
+	
 	platform_delay_ms(200);	
 
 	IIC_MIDDLE_Init();
@@ -430,6 +433,7 @@ int drv_qma_power_off(void)
 	nrf_gpio_pin_write(PIN_QMA7981_SDA,0);
 	nrf_gpio_pin_write(PIN_QMA7981_SCLK,0);
 	nrf_gpio_pin_write(PIN_QMA7981_nCS,0);
+	
 	nrf_gpio_pin_write(PIN_QMA7981_POWER,0);
 	
 	return 0;
@@ -457,6 +461,9 @@ int drv_qma_power_on(void)
 	
 	nrf_gpio_pin_write(PIN_QMA7981_AD0,ADO);
 
+	nrf_gpio_cfg_output(PIN_QMA7981_nCS);
+	nrf_gpio_pin_write(PIN_QMA7981_nCS,1);
+	
 	IIC_MIDDLE_Init();
 	
 	//初始化结构体
@@ -601,6 +608,7 @@ int	drv_qma_set_acc_odr(QMA_ACC_ODR_e acc_odr)
 	
 	return 0;
 }
+
 /**
 	@brief 		获取QMA配置参数
 	@param 		param 								- [in]	QMA配置参数

+ 1 - 1
motion/trajAlgorithm/footPDR.c

@@ -708,7 +708,7 @@ unsigned char footPDR(uint32_t num, float *gyr, float *acc, uint16_t front_press
 	
 	if(num  < last_timestamp)
 	{
-		dt =(float)(4294967295 - last_timestamp + num) * 0.000001f;
+		dt =0.00245f;
 	}
 	
 	last_timestamp = num;

+ 131 - 131
pca10040/s132/arm5_no_packs/JLinkLog.txt

@@ -1,131 +1,131 @@
-T1BAC 000:160.166   SEGGER J-Link V7.56a Log File
-T1BAC 000:160.280   DLL Compiled: Oct 11 2021 16:27:21
-T1BAC 000:160.284   Logging started @ 2022-06-30 07:12
-T1BAC 000:160.288 - 160.291ms
-T1BAC 000:160.296 JLINK_SetWarnOutHandler(...)
-T1BAC 000:160.302 - 0.007ms
-T1BAC 000:160.318 JLINK_OpenEx(...)
-T1BAC 000:164.787   Firmware: J-Link V9 compiled May  7 2021 16:26:12
-T1BAC 000:165.390   Firmware: J-Link V9 compiled May  7 2021 16:26:12
-T1BAC 000:165.544   Decompressing FW timestamp took 129 us
-T1BAC 000:172.931   Hardware: V9.40
-T1BAC 000:172.950   S/N: 99452020
-T1BAC 000:172.957   OEM: SEGGER
-T1BAC 000:172.964   Feature(s): RDI, GDB, FlashDL, FlashBP, JFlash
-T1BAC 000:177.547   TELNET listener socket opened on port 19021
-T1BAC 000:177.698   WEBSRV WEBSRV_Init(): Starting webserver thread(s)
-T1BAC 000:177.767   WEBSRV Failed to put socket into listener state (port 19080)
-T1BAC 000:177.869   WEBSRV Webserver running on local port 19081
-T1BAC 000:191.567 - 31.275ms returns "O.K."
-T1BAC 000:191.657 JLINK_GetEmuCaps()
-T1BAC 000:191.664 - 0.009ms returns 0xB9FF7BBF
-T1BAC 000:191.685 JLINK_TIF_GetAvailable(...)
-T1BAC 000:192.722 - 1.043ms
-T1BAC 000:192.748 JLINK_SetErrorOutHandler(...)
-T1BAC 000:192.768 - 0.022ms
-T1BAC 000:192.796 JLINK_ExecCommand("ProjectFile = "D:\Git_Project\shoes\smart_shoes\nRF5_SDK_17.0.0_9d13099\examples\long\shoe_mcu\pca10040\s132\arm5_no_packs\JLinkSettings.ini"", ...). 
-T1BAC 000:201.273   Ref file found at: C:\Keil_v5\ARM\Segger\JLinkDevices.ref
-T1BAC 000:201.357   XML referenced by ref file: C:\Program Files\SEGGER\JLink\JLinkDevices.xml
-T1BAC 000:201.995   C:\Program Files\SEGGER\JLink\JLinkDevices.xml evaluated successfully.
-T1BAC 000:230.581 - 37.793ms returns 0x00
-T1BAC 000:230.609 JLINK_ExecCommand("Device = nRF52832_xxAA", ...). 
-T1BAC 000:230.832   Device "NRF52832_XXAA" selected.
-T1BAC 000:231.037 - 0.422ms returns 0x00
-T1BAC 000:231.049 JLINK_ExecCommand("DisableConnectionTimeout", ...). 
-T1BAC 000:231.058 - 0.004ms returns 0x01
-T1BAC 000:231.064 JLINK_GetHardwareVersion()
-T1BAC 000:231.069 - 0.007ms returns 94000
-T1BAC 000:231.075 JLINK_GetDLLVersion()
-T1BAC 000:231.080 - 0.006ms returns 75601
-T1BAC 000:231.085 JLINK_GetOEMString(...)
-T1BAC 000:231.091 JLINK_GetFirmwareString(...)
-T1BAC 000:231.096 - 0.006ms
-T1BAC 000:231.104 JLINK_GetDLLVersion()
-T1BAC 000:231.109 - 0.006ms returns 75601
-T1BAC 000:231.114 JLINK_GetCompileDateTime()
-T1BAC 000:231.119 - 0.006ms
-T1BAC 000:231.127 JLINK_GetFirmwareString(...)
-T1BAC 000:231.131 - 0.006ms
-T1BAC 000:231.138 JLINK_GetHardwareVersion()
-T1BAC 000:231.142 - 0.006ms returns 94000
-T1BAC 000:231.149 JLINK_GetSN()
-T1BAC 000:231.153 - 0.006ms returns 99452020
-T1BAC 000:231.160 JLINK_GetOEMString(...)
-T1BAC 000:231.168 JLINK_TIF_Select(JLINKARM_TIF_SWD)
-T1BAC 000:233.328 - 2.194ms returns 0x00
-T1BAC 000:233.386 JLINK_HasError()
-T1BAC 000:233.398 JLINK_SetSpeed(5000)
-T1BAC 000:234.305 - 0.912ms
-T1BAC 000:234.620 JLINK_HasError()
-T1BAC 000:234.630 JLINK_SetResetType(JLINKARM_RESET_TYPE_NORMAL)
-T1BAC 000:234.635 - 0.007ms returns JLINKARM_RESET_TYPE_NORMAL
-T1BAC 000:234.642 JLINK_Reset()
-T1BAC 000:239.496   InitTarget() start
-T1BAC 000:239.507    J-Link Script File: Executing InitTarget()
-T1BAC 000:241.638   InitTarget() end
-T1BAC 000:242.105   Found SW-DP with ID 0x2BA01477
-T1BAC 000:243.694   DPIDR: 0x2BA01477
-T1BAC 000:243.708   Scanning AP map to find all available APs
-T1BAC 000:244.479   AP[2]: Stopped AP scan as end of AP map has been reached
-T1BAC 000:244.494   AP[0]: AHB-AP (IDR: 0x24770011)
-T1BAC 000:244.502   AP[1]: JTAG-AP (IDR: 0x02880000)
-T1BAC 000:244.509   Iterating through AP map to find AHB-AP to use
-T1BAC 000:245.193   AP[0]: Core found
-T1BAC 000:245.206   AP[0]: AHB-AP ROM base: 0xE00FF000
-T1BAC 000:245.560   CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
-T1BAC 000:245.571   Found Cortex-M4 r0p1, Little endian.
-T1BAC 000:346.350   -- Max. mem block: 0x0000D538
-T1BAC 000:348.793   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T1BAC 000:349.139   CPU_ReadMem(4 bytes @ 0xE0002000)
-T1BAC 000:349.628   FPUnit: 6 code (BP) slots and 2 literal slots
-T1BAC 000:349.653   CPU_ReadMem(4 bytes @ 0xE000EDFC)
-T1BAC 000:350.013   CPU_ReadMem(4 bytes @ 0xE0001000)
-T1BAC 000:350.395   CPU_WriteMem(4 bytes @ 0xE0001000)
-T1BAC 000:350.802   CPU_ReadMem(4 bytes @ 0xE000ED88)
-T1BAC 000:351.182   CPU_WriteMem(4 bytes @ 0xE000ED88)
-T1BAC 000:351.544   CPU_ReadMem(4 bytes @ 0xE000ED88)
-T1BAC 000:351.906   CPU_WriteMem(4 bytes @ 0xE000ED88)
-T1BAC 000:352.286   CoreSight components:
-T1BAC 000:352.310   ROMTbl[0] @ E00FF000
-T1BAC 000:352.328   CPU_ReadMem(64 bytes @ 0xE00FF000)
-T1BAC 000:352.936   CPU_ReadMem(32 bytes @ 0xE000EFE0)
-T1BAC 000:353.402   [0][0]: E000E000 CID B105E00D PID 000BB00C SCS-M7
-T1BAC 000:353.426   CPU_ReadMem(32 bytes @ 0xE0001FE0)
-T1BAC 000:353.882   [0][1]: E0001000 CID B105E00D PID 003BB002 DWT
-T1BAC 000:353.906   CPU_ReadMem(32 bytes @ 0xE0002FE0)
-T1BAC 000:354.384   [0][2]: E0002000 CID B105E00D PID 002BB003 FPB
-T1BAC 000:354.407   CPU_ReadMem(32 bytes @ 0xE0000FE0)
-T1BAC 000:354.872   [0][3]: E0000000 CID B105E00D PID 003BB001 ITM
-T1BAC 000:354.896   CPU_ReadMem(32 bytes @ 0xE0040FE0)
-T1BAC 000:355.455   [0][4]: E0040000 CID B105900D PID 000BB9A1 TPIU
-T1BAC 000:355.479   CPU_ReadMem(32 bytes @ 0xE0041FE0)
-T1BAC 000:356.155   [0][5]: E0041000 CID B105900D PID 000BB925 ETM
-T1BAC 000:357.067   CPU is running
-T1BAC 000:357.095   CPU_WriteMem(4 bytes @ 0xE000EDF0)
-T1BAC 000:357.454   CPU is running
-T1BAC 000:357.480   CPU_WriteMem(4 bytes @ 0xE000EDFC)
-T1BAC 000:357.841   Reset: Halt core after reset via DEMCR.VC_CORERESET.
-T1BAC 000:358.406   Reset: Reset device via AIRCR.SYSRESETREQ.
-T1BAC 000:358.430   CPU is running
-T1BAC 000:358.447   CPU_WriteMem(4 bytes @ 0xE000ED0C)
-T1BAC 000:410.974   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T1BAC 000:411.570   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T1BAC 000:412.275   CPU is running
-T1BAC 000:412.330   CPU_WriteMem(4 bytes @ 0xE000EDF0)
-T1BAC 000:412.896   CPU is running
-T1BAC 000:412.945   CPU_WriteMem(4 bytes @ 0xE000EDFC)
-T1BAC 000:419.207   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T1BAC 000:422.502   CPU_WriteMem(4 bytes @ 0xE0002000)
-T1BAC 000:423.090   CPU_ReadMem(4 bytes @ 0xE000EDFC)
-T1BAC 000:423.662   CPU_ReadMem(4 bytes @ 0xE0001000)
-T1BAC 000:424.527 - 189.910ms
-T1BAC 000:424.643 JLINK_GetId()
-T1BAC 000:425.198 - 0.580ms returns 0x2BA01477
-T1BAC 000:440.825 JLINK_GetFirmwareString(...)
-T1BAC 000:440.868 - 0.054ms
-T1BAC 000:813.898 JLINK_Close()
-T1BAC 000:818.187   CPU_ReadMem(4 bytes @ 0xE0001000)
-T1BAC 000:818.515   CPU_WriteMem(4 bytes @ 0xE0001004)
-T1BAC 000:833.417 - 19.534ms
-T1BAC 000:833.436   
-T1BAC 000:833.441   Closed
+T3EAC 000:176.865   SEGGER J-Link V7.56a Log File
+T3EAC 000:177.141   DLL Compiled: Oct 11 2021 16:27:21
+T3EAC 000:177.155   Logging started @ 2022-07-04 08:28
+T3EAC 000:177.166 - 177.173ms
+T3EAC 000:177.189 JLINK_SetWarnOutHandler(...)
+T3EAC 000:177.204 - 0.021ms
+T3EAC 000:177.220 JLINK_OpenEx(...)
+T3EAC 000:184.735   Firmware: J-Link V9 compiled May  7 2021 16:26:12
+T3EAC 000:185.478   Firmware: J-Link V9 compiled May  7 2021 16:26:12
+T3EAC 000:185.888   Decompressing FW timestamp took 363 us
+T3EAC 000:193.488   Hardware: V9.40
+T3EAC 000:193.515   S/N: 99452020
+T3EAC 000:193.525   OEM: SEGGER
+T3EAC 000:193.536   Feature(s): RDI, GDB, FlashDL, FlashBP, JFlash
+T3EAC 000:199.141   TELNET listener socket opened on port 19021
+T3EAC 000:199.355   WEBSRV WEBSRV_Init(): Starting webserver thread(s)
+T3EAC 000:199.450   WEBSRV Failed to put socket into listener state (port 19080)
+T3EAC 000:199.580   WEBSRV Webserver running on local port 19081
+T3EAC 000:206.345 - 29.139ms returns "O.K."
+T3EAC 000:206.428 JLINK_GetEmuCaps()
+T3EAC 000:206.437 - 0.013ms returns 0xB9FF7BBF
+T3EAC 000:206.456 JLINK_TIF_GetAvailable(...)
+T3EAC 000:207.452 - 1.005ms
+T3EAC 000:207.493 JLINK_SetErrorOutHandler(...)
+T3EAC 000:207.501 - 0.011ms
+T3EAC 000:207.526 JLINK_ExecCommand("ProjectFile = "D:\Git_Project\shoes\smart_shoes\nRF5_SDK_17.0.0_9d13099\examples\long\shoe_mcu\pca10040\s132\arm5_no_packs\JLinkSettings.ini"", ...). 
+T3EAC 000:220.589   Ref file found at: C:\Keil_v5\ARM\Segger\JLinkDevices.ref
+T3EAC 000:220.737   XML referenced by ref file: C:\Program Files\SEGGER\JLink\JLinkDevices.xml
+T3EAC 000:221.783   C:\Program Files\SEGGER\JLink\JLinkDevices.xml evaluated successfully.
+T3EAC 000:258.672 - 51.154ms returns 0x00
+T3EAC 000:258.698 JLINK_ExecCommand("Device = nRF52832_xxAA", ...). 
+T3EAC 000:258.878   Device "NRF52832_XXAA" selected.
+T3EAC 000:259.070 - 0.369ms returns 0x00
+T3EAC 000:259.081 JLINK_ExecCommand("DisableConnectionTimeout", ...). 
+T3EAC 000:259.089 - 0.003ms returns 0x01
+T3EAC 000:259.098 JLINK_GetHardwareVersion()
+T3EAC 000:259.102 - 0.006ms returns 94000
+T3EAC 000:259.108 JLINK_GetDLLVersion()
+T3EAC 000:259.112 - 0.006ms returns 75601
+T3EAC 000:259.118 JLINK_GetOEMString(...)
+T3EAC 000:259.123 JLINK_GetFirmwareString(...)
+T3EAC 000:259.127 - 0.006ms
+T3EAC 000:259.135 JLINK_GetDLLVersion()
+T3EAC 000:259.138 - 0.006ms returns 75601
+T3EAC 000:259.144 JLINK_GetCompileDateTime()
+T3EAC 000:259.148 - 0.006ms
+T3EAC 000:259.155 JLINK_GetFirmwareString(...)
+T3EAC 000:259.159 - 0.006ms
+T3EAC 000:259.165 JLINK_GetHardwareVersion()
+T3EAC 000:259.169 - 0.006ms returns 94000
+T3EAC 000:259.175 JLINK_GetSN()
+T3EAC 000:259.179 - 0.006ms returns 99452020
+T3EAC 000:259.185 JLINK_GetOEMString(...)
+T3EAC 000:259.193 JLINK_TIF_Select(JLINKARM_TIF_SWD)
+T3EAC 000:261.411 - 2.223ms returns 0x00
+T3EAC 000:261.437 JLINK_HasError()
+T3EAC 000:261.448 JLINK_SetSpeed(5000)
+T3EAC 000:262.459 - 1.016ms
+T3EAC 000:262.753 JLINK_HasError()
+T3EAC 000:262.763 JLINK_SetResetType(JLINKARM_RESET_TYPE_NORMAL)
+T3EAC 000:262.768 - 0.007ms returns JLINKARM_RESET_TYPE_NORMAL
+T3EAC 000:262.774 JLINK_Reset()
+T3EAC 000:268.114   InitTarget() start
+T3EAC 000:268.135    J-Link Script File: Executing InitTarget()
+T3EAC 000:270.191   InitTarget() end
+T3EAC 000:270.648   Found SW-DP with ID 0x2BA01477
+T3EAC 000:272.327   DPIDR: 0x2BA01477
+T3EAC 000:272.349   Scanning AP map to find all available APs
+T3EAC 000:273.055   AP[2]: Stopped AP scan as end of AP map has been reached
+T3EAC 000:273.069   AP[0]: AHB-AP (IDR: 0x24770011)
+T3EAC 000:273.077   AP[1]: JTAG-AP (IDR: 0x02880000)
+T3EAC 000:273.084   Iterating through AP map to find AHB-AP to use
+T3EAC 000:273.732   AP[0]: Core found
+T3EAC 000:273.742   AP[0]: AHB-AP ROM base: 0xE00FF000
+T3EAC 000:274.090   CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
+T3EAC 000:274.101   Found Cortex-M4 r0p1, Little endian.
+T3EAC 000:375.285   -- Max. mem block: 0x0000D538
+T3EAC 000:378.647   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T3EAC 000:379.267   CPU_ReadMem(4 bytes @ 0xE0002000)
+T3EAC 000:380.051   FPUnit: 6 code (BP) slots and 2 literal slots
+T3EAC 000:380.101   CPU_ReadMem(4 bytes @ 0xE000EDFC)
+T3EAC 000:380.662   CPU_ReadMem(4 bytes @ 0xE0001000)
+T3EAC 000:381.227   CPU_WriteMem(4 bytes @ 0xE0001000)
+T3EAC 000:381.974   CPU_ReadMem(4 bytes @ 0xE000ED88)
+T3EAC 000:382.596   CPU_WriteMem(4 bytes @ 0xE000ED88)
+T3EAC 000:383.195   CPU_ReadMem(4 bytes @ 0xE000ED88)
+T3EAC 000:383.815   CPU_WriteMem(4 bytes @ 0xE000ED88)
+T3EAC 000:384.449   CoreSight components:
+T3EAC 000:384.500   ROMTbl[0] @ E00FF000
+T3EAC 000:384.536   CPU_ReadMem(64 bytes @ 0xE00FF000)
+T3EAC 000:385.354   CPU_ReadMem(32 bytes @ 0xE000EFE0)
+T3EAC 000:386.056   [0][0]: E000E000 CID B105E00D PID 000BB00C SCS-M7
+T3EAC 000:386.106   CPU_ReadMem(32 bytes @ 0xE0001FE0)
+T3EAC 000:386.794   [0][1]: E0001000 CID B105E00D PID 003BB002 DWT
+T3EAC 000:386.841   CPU_ReadMem(32 bytes @ 0xE0002FE0)
+T3EAC 000:387.528   [0][2]: E0002000 CID B105E00D PID 002BB003 FPB
+T3EAC 000:387.576   CPU_ReadMem(32 bytes @ 0xE0000FE0)
+T3EAC 000:388.290   [0][3]: E0000000 CID B105E00D PID 003BB001 ITM
+T3EAC 000:388.338   CPU_ReadMem(32 bytes @ 0xE0040FE0)
+T3EAC 000:389.013   [0][4]: E0040000 CID B105900D PID 000BB9A1 TPIU
+T3EAC 000:389.061   CPU_ReadMem(32 bytes @ 0xE0041FE0)
+T3EAC 000:389.746   [0][5]: E0041000 CID B105900D PID 000BB925 ETM
+T3EAC 000:391.307   CPU is running
+T3EAC 000:391.363   CPU_WriteMem(4 bytes @ 0xE000EDF0)
+T3EAC 000:391.937   CPU is running
+T3EAC 000:391.985   CPU_WriteMem(4 bytes @ 0xE000EDFC)
+T3EAC 000:392.577   Reset: Halt core after reset via DEMCR.VC_CORERESET.
+T3EAC 000:393.526   Reset: Reset device via AIRCR.SYSRESETREQ.
+T3EAC 000:393.574   CPU is running
+T3EAC 000:393.610   CPU_WriteMem(4 bytes @ 0xE000ED0C)
+T3EAC 000:446.340   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T3EAC 000:446.945   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T3EAC 000:447.536   CPU is running
+T3EAC 000:447.584   CPU_WriteMem(4 bytes @ 0xE000EDF0)
+T3EAC 000:448.206   CPU is running
+T3EAC 000:448.254   CPU_WriteMem(4 bytes @ 0xE000EDFC)
+T3EAC 000:453.990   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T3EAC 000:457.346   CPU_WriteMem(4 bytes @ 0xE0002000)
+T3EAC 000:457.936   CPU_ReadMem(4 bytes @ 0xE000EDFC)
+T3EAC 000:458.538   CPU_ReadMem(4 bytes @ 0xE0001000)
+T3EAC 000:459.494 - 196.752ms
+T3EAC 000:459.628 JLINK_GetId()
+T3EAC 000:460.165 - 0.562ms returns 0x2BA01477
+T3EAC 000:486.409 JLINK_GetFirmwareString(...)
+T3EAC 000:486.467 - 0.069ms
+T3EAC 000:873.409 JLINK_Close()
+T3EAC 000:873.748   CPU_ReadMem(4 bytes @ 0xE0001000)
+T3EAC 000:874.107   CPU_WriteMem(4 bytes @ 0xE0001004)
+T3EAC 000:879.051 - 5.660ms
+T3EAC 000:879.073   
+T3EAC 000:879.079   Closed

File diff suppressed because it is too large
+ 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


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

@@ -55,10 +55,10 @@ Package Vendor: NordicSemiconductor
 
    * Component: NordicSemiconductor::Device:Startup:8.32.1
       Source file:   Device\Source\system_nrf52.c
-      Include file:  Device\Include\system_nrf.h
-      Source file:   Device\Source\arm\arm_startup_nrf52.s
       Include file:  Device\Include\system_nrf52.h
-Build Time Elapsed:  00:00:02
+      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>

File diff suppressed because it is too large
+ 7308 - 7308
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.hex


File diff suppressed because it is too large
+ 342 - 354
pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.htm


File diff suppressed because it is too large
+ 6 - 7
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	0x00010201
-#define SOFTWARE_VERSION	0x000B
+#define SOFTWARE_VERSION	0x000C
 
 // <h> ¹«¹²
 

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

@@ -1,3 +1,3 @@
-1.  更新算法
-2.  左右鞋检测一次之后,不再检测
-3.  增加恢复出厂设置的指令
+1.  取消打印
+2.  优化算法的时间搓
+3.  优化qma7891的驱动,开启电源之后,拉高CS引脚

Some files were not shown because too many files changed in this diff