ソースを参照

shoe_mcu2.2.1_new_v2

lwy 2 年 前
コミット
d3b3e5d2e9
18 ファイル変更2601 行追加2593 行削除
  1. 17 1
      shoe_mcu2.2.1_new_v2/app/app_single_line_pair.c
  2. 8 8
      shoe_mcu2.2.1_new_v2/dfu_readme/app_setting_cp.hex
  3. 262 262
      shoe_mcu2.2.1_new_v2/dfu_readme/app_setting_sd_boot_cp.hex
  4. 8 8
      shoe_mcu2.2.1_new_v2/dfu_readme/setting_sd_boot_cp.hex
  5. 131 134
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/JLinkLog.txt
  6. BIN
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/app_single_line_pair.crf
  7. BIN
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/app_single_line_pair.o
  8. 0 0
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/ble_app_uart_c_pca10040_s132_Shoes_FW_APP.dep
  9. BIN
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/fml_single_line_simplex.crf
  10. BIN
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/fml_single_line_simplex.o
  11. BIN
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.axf
  12. 4 7
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.build_log.htm
  13. 262 262
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.hex
  14. 24 24
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.htm
  15. 1876 1878
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.map
  16. BIN
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf_pwr_mgmt.crf
  17. BIN
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf_pwr_mgmt.o
  18. 9 9
      shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvguix.Administrator

+ 17 - 1
shoe_mcu2.2.1_new_v2/app/app_single_line_pair.c

@@ -62,7 +62,22 @@ static void app_single_line_pair_save_adv_or_scan_Process(void)
 	switch(ob_app_single_line_pair.save_adv_scan_flow)
 	{
 		case 0:
-			 MT_Run(500);
+			MT_Run(500);
+			 
+			if(memcmp(&mFlash.mClient.macAddr[3],&ob_app_single_line_pair.mac[3],3) == 0 && memcmp(&mFlash.macHost[0],&ob_app_single_line_pair.mac[0],3) == 0)			//若已配对过
+			{
+				DEBUG_LOG(">>>>>>>>already paired \r\n");
+				//只有配对成功时,才运行。
+				Process_Stop(app_single_line_pair_save_adv_or_scan_Process);	
+				//关灯
+				LED_Stop(LED_PAIR);					
+				//取消全功率配对
+				Process_SetHoldOn(app_single_line_pair_Process,0);	
+				//更新状态
+				ob_app_single_line_pair.state = APP_SINGLE_LINE_PAIR_STATE_PAIR_DONE;
+			}
+			else																																																																										//若没配对过
+			{
 			 //配对时候清空所有的步数
 			 if(Flash_DeleteAllStep() != ZONE_OP_SUCCESS){Except_TxError(EXCEPT_DATEStep,"clear step fail");break;}
 			 
@@ -88,6 +103,7 @@ static void app_single_line_pair_save_adv_or_scan_Process(void)
 			 
 			 ob_app_single_line_pair.save_adv_scan_flow =1;
 			 tim = TIME_GetTicks();
+			}
 			break;
 		
 		case 1:

+ 8 - 8
shoe_mcu2.2.1_new_v2/dfu_readme/app_setting_cp.hex

@@ -1,6 +1,6 @@
 :020000040007F3
-:10E00000B012312B020000000100000001000000EE
-:10E0100000000000000000002468020002F4D81C88
+:10E00000B7B91F96020000000100000001000000E7
+:10E010000000000000000000E0670200F04D8A00F0
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -36,12 +36,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000E02E5D064D
+:10E25000000000000000000000000000ED2CCC04D5
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A000000102F4D81C0000000000000000000083
+:10E2A0000001F04D8A0000000000000000000000A6
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -50,8 +50,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000B012312B020000000100000001000000DE
-:10F0100000000000000000002468020002F4D81C78
+:10F00000B7B91F96020000000100000001000000D7
+:10F010000000000000000000E0670200F04D8A00E0
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -87,12 +87,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000E02E5D063D
+:10F25000000000000000000000000000ED2CCC04C5
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A000000102F4D81C0000000000000000000073
+:10F2A0000001F04D8A000000000000000000000096
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

ファイルの差分が大きいため隠しています
+ 262 - 262
shoe_mcu2.2.1_new_v2/dfu_readme/app_setting_sd_boot_cp.hex


+ 8 - 8
shoe_mcu2.2.1_new_v2/dfu_readme/setting_sd_boot_cp.hex

@@ -11063,8 +11063,8 @@
 :10DF600000000000000000000000000000000000B1
 :10DF7000000000000090D00300000000000000003E
 :0CDF800085A6070000100000000008004B
-:10E00000B012312B020000000100000001000000EE
-:10E0100000000000000000002468020002F4D81C88
+:10E00000B7B91F96020000000100000001000000E7
+:10E010000000000000000000E0670200F04D8A00F0
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -11100,12 +11100,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000E02E5D064D
+:10E25000000000000000000000000000ED2CCC04D5
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A000000102F4D81C0000000000000000000083
+:10E2A0000001F04D8A0000000000000000000000A6
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -11114,8 +11114,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F00000B012312B020000000100000001000000DE
-:10F0100000000000000000002468020002F4D81C78
+:10F00000B7B91F96020000000100000001000000D7
+:10F010000000000000000000E0670200F04D8A00E0
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -11151,12 +11151,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000E02E5D063D
+:10F25000000000000000000000000000ED2CCC04C5
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A000000102F4D81C0000000000000000000073
+:10F2A0000001F04D8A000000000000000000000096
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

+ 131 - 134
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/JLinkLog.txt

@@ -1,134 +1,131 @@
-T16AC 000:255.019   SEGGER J-Link V7.58b Log File
-T16AC 000:255.169   DLL Compiled: Nov 16 2021 15:00:10
-T16AC 000:255.181   Logging started @ 2022-06-20 10:01
-T16AC 000:255.191 - 255.196ms
-T16AC 000:255.210 JLINK_SetWarnOutHandler(...)
-T16AC 000:255.222 - 0.017ms
-T16AC 000:255.234 JLINK_OpenEx(...)
-T16AC 000:260.099   Firmware: J-Link V9 compiled May  7 2021 16:26:12
-T16AC 000:260.446   Firmware: J-Link V9 compiled May  7 2021 16:26:12
-T16AC 000:260.693   Decompressing FW timestamp took 173 us
-T16AC 000:266.813   Hardware: V9.20
-T16AC 000:266.856   S/N: 59800878
-T16AC 000:266.873   OEM: SEGGER
-T16AC 000:266.890   Feature(s): RDI, GDB, FlashDL, FlashBP, JFlash
-T16AC 000:267.973   TELNET listener socket opened on port 19021
-T16AC 000:268.278   WEBSRV WEBSRV_Init(): Starting webserver thread(s)
-T16AC 000:268.367   WEBSRV Failed to put socket into listener state (port 19080)
-T16AC 000:268.512   WEBSRV Webserver running on local port 19081
-T16AC 000:281.630 - 26.413ms returns "O.K."
-T16AC 000:281.709 JLINK_GetEmuCaps()
-T16AC 000:281.736 - 0.033ms returns 0xB9FF7BBF
-T16AC 000:281.753 JLINK_TIF_GetAvailable(...)
-T16AC 000:281.913 - 0.180ms
-T16AC 000:281.944 JLINK_SetErrorOutHandler(...)
-T16AC 000:281.970 - 0.046ms
-T16AC 000:282.042 JLINK_ExecCommand("ProjectFile = "F:\exampleProject\test_sleep2\nRF5_SDK_17.0.0_9d13099\examples\long\shoe_mcu2.2.1_new_v2\pca10040\s132\arm5_no_packs\JLinkSettings.ini"", ...). 
-T16AC 000:295.415   Ref file found at: E:\keil530\Keil_v5\ARM\Segger\JLinkDevices.ref
-T16AC 000:295.738   XML referenced by ref file: C:\Program Files (x86)\SEGGER\JLink\JLinkDevices.xml
-T16AC 000:296.514   C:\Program Files (x86)\SEGGER\JLink\JLinkDevices.xml evaluated successfully.
-T16AC 000:500.858 - 218.832ms returns 0x00
-T16AC 000:500.913 JLINK_ExecCommand("Device = nRF52832_xxAA", ...). 
-T16AC 000:501.175   Device "NRF52832_XXAA" selected.
-T16AC 000:502.488 - 1.570ms returns 0x00
-T16AC 000:502.510 JLINK_ExecCommand("DisableConnectionTimeout", ...). 
-T16AC 000:502.539 - 0.007ms returns 0x01
-T16AC 000:502.563 JLINK_GetHardwareVersion()
-T16AC 000:502.577 - 0.018ms returns 92000
-T16AC 000:502.624 JLINK_GetDLLVersion()
-T16AC 000:502.638 - 0.018ms returns 75802
-T16AC 000:502.650 JLINK_GetOEMString(...)
-T16AC 000:502.673 JLINK_GetFirmwareString(...)
-T16AC 000:502.685 - 0.016ms
-T16AC 000:502.700 JLINK_GetDLLVersion()
-T16AC 000:502.710 - 0.015ms returns 75802
-T16AC 000:502.722 JLINK_GetCompileDateTime()
-T16AC 000:502.732 - 0.015ms
-T16AC 000:502.746 JLINK_GetFirmwareString(...)
-T16AC 000:502.767 - 0.039ms
-T16AC 000:502.793 JLINK_GetHardwareVersion()
-T16AC 000:502.814 - 0.026ms returns 92000
-T16AC 000:502.840 JLINK_GetSN()
-T16AC 000:502.851 - 0.016ms returns 59800878
-T16AC 000:502.864 JLINK_GetOEMString(...)
-T16AC 000:502.878 JLINK_TIF_Select(JLINKARM_TIF_SWD)
-T16AC 000:503.604 - 0.754ms returns 0x00
-T16AC 000:503.643 JLINK_HasError()
-T16AC 000:503.668 JLINK_SetSpeed(5000)
-T16AC 000:503.770 - 0.121ms
-T16AC 000:504.131 JLINK_HasError()
-T16AC 000:504.148 JLINK_SetResetType(JLINKARM_RESET_TYPE_NORMAL)
-T16AC 000:504.159 - 0.016ms returns JLINKARM_RESET_TYPE_NORMAL
-T16AC 000:504.178 JLINK_Reset()
-T16AC 000:504.421   InitTarget() start
-T16AC 000:504.442    J-Link Script File: Executing InitTarget()
-T16AC 000:506.502   InitTarget() end
-T16AC 000:507.238   Found SW-DP with ID 0x2BA01477
-T16AC 000:509.241   DPIDR: 0x2BA01477
-T16AC 000:509.265   CoreSight SoC-400 or earlier
-T16AC 000:509.288   Scanning AP map to find all available APs
-T16AC 000:510.061   AP[2]: Stopped AP scan as end of AP map has been reached
-T16AC 000:510.089   AP[0]: AHB-AP (IDR: 0x24770011)
-T16AC 000:510.106   AP[1]: JTAG-AP (IDR: 0x02880000)
-T16AC 000:510.122   Iterating through AP map to find AHB-AP to use
-T16AC 000:510.853   AP[0]: Core found
-T16AC 000:510.874   AP[0]: AHB-AP ROM base: 0xE00FF000
-T16AC 000:511.266   CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
-T16AC 000:511.286   Found Cortex-M4 r0p1, Little endian.
-T16AC 000:612.136   -- Max. mem block: 0x00010C20
-T16AC 000:612.544   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T16AC 000:613.292   CPU_WriteMem(4 bytes @ 0xE000EDF0)
-T16AC 000:613.827   CPU_ReadMem(4 bytes @ 0xE0002000)
-T16AC 000:614.298   FPUnit: 6 code (BP) slots and 2 literal slots
-T16AC 000:614.388   CPU_ReadMem(4 bytes @ 0xE000EDFC)
-T16AC 000:614.867   CPU_WriteMem(4 bytes @ 0xE000EDFC)
-T16AC 000:615.348   CPU_ReadMem(4 bytes @ 0xE0001000)
-T16AC 000:616.091   CPU_WriteMem(4 bytes @ 0xE0001000)
-T16AC 000:616.545   CPU_ReadMem(4 bytes @ 0xE000ED88)
-T16AC 000:617.025   CPU_WriteMem(4 bytes @ 0xE000ED88)
-T16AC 000:617.503   CPU_ReadMem(4 bytes @ 0xE000ED88)
-T16AC 000:617.983   CPU_WriteMem(4 bytes @ 0xE000ED88)
-T16AC 000:618.448   CoreSight components:
-T16AC 000:618.569   ROMTbl[0] @ E00FF000
-T16AC 000:618.650   CPU_ReadMem(64 bytes @ 0xE00FF000)
-T16AC 000:619.341   CPU_ReadMem(32 bytes @ 0xE000EFE0)
-T16AC 000:619.932   [0][0]: E000E000 CID B105E00D PID 000BB00C SCS-M7
-T16AC 000:620.021   CPU_ReadMem(32 bytes @ 0xE0001FE0)
-T16AC 000:620.596   [0][1]: E0001000 CID B105E00D PID 003BB002 DWT
-T16AC 000:620.684   CPU_ReadMem(32 bytes @ 0xE0002FE0)
-T16AC 000:621.286   [0][2]: E0002000 CID B105E00D PID 002BB003 FPB
-T16AC 000:621.375   CPU_ReadMem(32 bytes @ 0xE0000FE0)
-T16AC 000:621.971   [0][3]: E0000000 CID B105E00D PID 003BB001 ITM
-T16AC 000:622.058   CPU_ReadMem(32 bytes @ 0xE0040FE0)
-T16AC 000:622.632   [0][4]: E0040000 CID B105900D PID 000BB9A1 TPIU
-T16AC 000:622.720   CPU_ReadMem(32 bytes @ 0xE0041FE0)
-T16AC 000:623.322   [0][5]: E0041000 CID B105900D PID 000BB925 ETM
-T16AC 000:623.598   CPU is running
-T16AC 000:623.693   CPU_WriteMem(4 bytes @ 0xE000EDF0)
-T16AC 000:624.146   CPU is running
-T16AC 000:624.235   CPU_WriteMem(4 bytes @ 0xE000EDFC)
-T16AC 000:624.718   Reset: Halt core after reset via DEMCR.VC_CORERESET.
-T16AC 000:625.391   Reset: Reset device via AIRCR.SYSRESETREQ.
-T16AC 000:625.480   CPU is running
-T16AC 000:625.558   CPU_WriteMem(4 bytes @ 0xE000ED0C)
-T16AC 000:678.101   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T16AC 000:678.633   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T16AC 000:679.125   CPU is running
-T16AC 000:679.214   CPU_WriteMem(4 bytes @ 0xE000EDF0)
-T16AC 000:679.675   CPU is running
-T16AC 000:679.763   CPU_WriteMem(4 bytes @ 0xE000EDFC)
-T16AC 000:685.888   CPU_ReadMem(4 bytes @ 0xE000EDF0)
-T16AC 000:688.680   CPU_WriteMem(4 bytes @ 0xE0002000)
-T16AC 000:689.164   CPU_ReadMem(4 bytes @ 0xE000EDFC)
-T16AC 000:689.646   CPU_ReadMem(4 bytes @ 0xE0001000)
-T16AC 000:690.141 - 186.000ms
-T16AC 000:690.233 JLINK_GetId()
-T16AC 000:690.576 - 0.381ms returns 0x2BA01477
-T16AC 000:711.124 JLINK_GetFirmwareString(...)
-T16AC 000:711.201 - 0.102ms
-T16AC 001:158.677 JLINK_Close()
-T16AC 001:159.066   CPU_ReadMem(4 bytes @ 0xE0001000)
-T16AC 001:159.382   CPU_WriteMem(4 bytes @ 0xE0001004)
-T16AC 001:173.693 - 15.037ms
-T16AC 001:173.721   
-T16AC 001:173.733   Closed
+T1B58 000:249.845   SEGGER J-Link V7.58b Log File
+T1B58 000:249.978   DLL Compiled: Nov 16 2021 15:00:10
+T1B58 000:249.990   Logging started @ 2022-06-29 06:34
+T1B58 000:250.002 - 250.007ms
+T1B58 000:250.020 JLINK_SetWarnOutHandler(...)
+T1B58 000:250.034 - 0.019ms
+T1B58 000:250.047 JLINK_OpenEx(...)
+T1B58 000:251.536   Firmware: J-Link V9 compiled May  7 2021 16:26:12
+T1B58 000:251.792   Firmware: J-Link V9 compiled May  7 2021 16:26:12
+T1B58 000:251.970   Decompressing FW timestamp took 135 us
+T1B58 000:257.602   Hardware: V9.20
+T1B58 000:257.637   S/N: 59800878
+T1B58 000:257.655   OEM: SEGGER
+T1B58 000:257.672   Feature(s): RDI, GDB, FlashDL, FlashBP, JFlash
+T1B58 000:258.557   TELNET listener socket opened on port 19021
+T1B58 000:258.812   WEBSRV WEBSRV_Init(): Starting webserver thread(s)
+T1B58 000:259.020   WEBSRV Webserver running on local port 19080
+T1B58 000:275.603 - 25.577ms returns "O.K."
+T1B58 000:275.653 JLINK_GetEmuCaps()
+T1B58 000:275.668 - 0.020ms returns 0xB9FF7BBF
+T1B58 000:275.686 JLINK_TIF_GetAvailable(...)
+T1B58 000:275.836 - 0.162ms
+T1B58 000:275.863 JLINK_SetErrorOutHandler(...)
+T1B58 000:275.875 - 0.017ms
+T1B58 000:275.909 JLINK_ExecCommand("ProjectFile = "F:\exampleProject\test_sleep2\nRF5_SDK_17.0.0_9d13099\examples\long\shoe_mcu2.2.1_new_v2\pca10040\s132\arm5_no_packs\JLinkSettings.ini"", ...). 
+T1B58 000:291.295   Ref file found at: E:\keil530\Keil_v5\ARM\Segger\JLinkDevices.ref
+T1B58 000:291.595   XML referenced by ref file: C:\Program Files (x86)\SEGGER\JLink\JLinkDevices.xml
+T1B58 000:292.472   C:\Program Files (x86)\SEGGER\JLink\JLinkDevices.xml evaluated successfully.
+T1B58 000:493.107 - 217.213ms returns 0x00
+T1B58 000:493.150 JLINK_ExecCommand("Device = nRF52832_xxAA", ...). 
+T1B58 000:493.396   Device "NRF52832_XXAA" selected.
+T1B58 000:494.751 - 1.597ms returns 0x00
+T1B58 000:494.777 JLINK_ExecCommand("DisableConnectionTimeout", ...). 
+T1B58 000:494.794 - 0.007ms returns 0x01
+T1B58 000:494.824 JLINK_GetHardwareVersion()
+T1B58 000:494.836 - 0.017ms returns 92000
+T1B58 000:494.860 JLINK_GetDLLVersion()
+T1B58 000:494.886 - 0.031ms returns 75802
+T1B58 000:494.899 JLINK_GetOEMString(...)
+T1B58 000:495.014 JLINK_GetFirmwareString(...)
+T1B58 000:495.045 - 0.037ms
+T1B58 000:495.063 JLINK_GetDLLVersion()
+T1B58 000:495.073 - 0.016ms returns 75802
+T1B58 000:495.086 JLINK_GetCompileDateTime()
+T1B58 000:495.096 - 0.015ms
+T1B58 000:495.110 JLINK_GetFirmwareString(...)
+T1B58 000:495.121 - 0.015ms
+T1B58 000:495.134 JLINK_GetHardwareVersion()
+T1B58 000:495.144 - 0.015ms returns 92000
+T1B58 000:495.157 JLINK_GetSN()
+T1B58 000:495.168 - 0.016ms returns 59800878
+T1B58 000:495.181 JLINK_GetOEMString(...)
+T1B58 000:495.196 JLINK_TIF_Select(JLINKARM_TIF_SWD)
+T1B58 000:495.892 - 0.721ms returns 0x00
+T1B58 000:495.927 JLINK_HasError()
+T1B58 000:495.946 JLINK_SetSpeed(5000)
+T1B58 000:496.045 - 0.124ms
+T1B58 000:496.379 JLINK_HasError()
+T1B58 000:496.395 JLINK_SetResetType(JLINKARM_RESET_TYPE_NORMAL)
+T1B58 000:496.406 - 0.016ms returns JLINKARM_RESET_TYPE_NORMAL
+T1B58 000:496.421 JLINK_Reset()
+T1B58 000:496.654   InitTarget() start
+T1B58 000:496.674    J-Link Script File: Executing InitTarget()
+T1B58 000:498.979   InitTarget() end
+T1B58 000:499.500   Found SW-DP with ID 0x2BA01477
+T1B58 000:501.581   DPIDR: 0x2BA01477
+T1B58 000:501.600   CoreSight SoC-400 or earlier
+T1B58 000:501.620   Scanning AP map to find all available APs
+T1B58 000:502.336   AP[2]: Stopped AP scan as end of AP map has been reached
+T1B58 000:502.360   AP[0]: AHB-AP (IDR: 0x24770011)
+T1B58 000:502.377   AP[1]: JTAG-AP (IDR: 0x02880000)
+T1B58 000:502.405   Iterating through AP map to find AHB-AP to use
+T1B58 000:503.195   AP[0]: Core found
+T1B58 000:503.215   AP[0]: AHB-AP ROM base: 0xE00FF000
+T1B58 000:503.612   CPUID register: 0x410FC241. Implementer code: 0x41 (ARM)
+T1B58 000:503.647   Found Cortex-M4 r0p1, Little endian.
+T1B58 000:604.814   -- Max. mem block: 0x00010C20
+T1B58 000:605.186   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T1B58 000:605.677   CPU_ReadMem(4 bytes @ 0xE0002000)
+T1B58 000:606.361   FPUnit: 6 code (BP) slots and 2 literal slots
+T1B58 000:606.465   CPU_ReadMem(4 bytes @ 0xE000EDFC)
+T1B58 000:607.050   CPU_ReadMem(4 bytes @ 0xE0001000)
+T1B58 000:607.540   CPU_WriteMem(4 bytes @ 0xE0001000)
+T1B58 000:608.033   CPU_ReadMem(4 bytes @ 0xE000ED88)
+T1B58 000:608.494   CPU_WriteMem(4 bytes @ 0xE000ED88)
+T1B58 000:608.971   CPU_ReadMem(4 bytes @ 0xE000ED88)
+T1B58 000:609.460   CPU_WriteMem(4 bytes @ 0xE000ED88)
+T1B58 000:610.005   CoreSight components:
+T1B58 000:610.121   ROMTbl[0] @ E00FF000
+T1B58 000:610.202   CPU_ReadMem(64 bytes @ 0xE00FF000)
+T1B58 000:610.876   CPU_ReadMem(32 bytes @ 0xE000EFE0)
+T1B58 000:611.472   [0][0]: E000E000 CID B105E00D PID 000BB00C SCS-M7
+T1B58 000:611.562   CPU_ReadMem(32 bytes @ 0xE0001FE0)
+T1B58 000:612.137   [0][1]: E0001000 CID B105E00D PID 003BB002 DWT
+T1B58 000:612.237   CPU_ReadMem(32 bytes @ 0xE0002FE0)
+T1B58 000:612.815   [0][2]: E0002000 CID B105E00D PID 002BB003 FPB
+T1B58 000:612.906   CPU_ReadMem(32 bytes @ 0xE0000FE0)
+T1B58 000:613.494   [0][3]: E0000000 CID B105E00D PID 003BB001 ITM
+T1B58 000:613.586   CPU_ReadMem(32 bytes @ 0xE0040FE0)
+T1B58 000:614.200   [0][4]: E0040000 CID B105900D PID 000BB9A1 TPIU
+T1B58 000:614.298   CPU_ReadMem(32 bytes @ 0xE0041FE0)
+T1B58 000:614.869   [0][5]: E0041000 CID B105900D PID 000BB925 ETM
+T1B58 000:615.107   CPU is running
+T1B58 000:615.195   CPU_WriteMem(4 bytes @ 0xE000EDF0)
+T1B58 000:615.673   CPU is running
+T1B58 000:615.763   CPU_WriteMem(4 bytes @ 0xE000EDFC)
+T1B58 000:616.202   Reset: Halt core after reset via DEMCR.VC_CORERESET.
+T1B58 000:616.652   Reset: Reset device via AIRCR.SYSRESETREQ.
+T1B58 000:616.691   CPU is running
+T1B58 000:616.725   CPU_WriteMem(4 bytes @ 0xE000ED0C)
+T1B58 000:669.614   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T1B58 000:670.002   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T1B58 000:670.376   CPU is running
+T1B58 000:670.415   CPU_WriteMem(4 bytes @ 0xE000EDF0)
+T1B58 000:670.784   CPU is running
+T1B58 000:670.823   CPU_WriteMem(4 bytes @ 0xE000EDFC)
+T1B58 000:676.314   CPU_ReadMem(4 bytes @ 0xE000EDF0)
+T1B58 000:679.123   CPU_WriteMem(4 bytes @ 0xE0002000)
+T1B58 000:679.669   CPU_ReadMem(4 bytes @ 0xE000EDFC)
+T1B58 000:680.157   CPU_ReadMem(4 bytes @ 0xE0001000)
+T1B58 000:680.652 - 184.269ms
+T1B58 000:680.744 JLINK_GetId()
+T1B58 000:681.093 - 0.396ms returns 0x2BA01477
+T1B58 000:701.140 JLINK_GetFirmwareString(...)
+T1B58 000:701.226 - 0.112ms
+T1B58 001:333.656 JLINK_Close()
+T1B58 001:334.047   CPU_ReadMem(4 bytes @ 0xE0001000)
+T1B58 001:334.383   CPU_WriteMem(4 bytes @ 0xE0001004)
+T1B58 001:356.428 - 22.794ms
+T1B58 001:356.457   
+T1B58 001:356.469   Closed

BIN
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/app_single_line_pair.crf


BIN
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/app_single_line_pair.o


ファイルの差分が大きいため隠しています
+ 0 - 0
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/ble_app_uart_c_pca10040_s132_Shoes_FW_APP.dep


BIN
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/fml_single_line_simplex.crf


BIN
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/fml_single_line_simplex.o


BIN
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.axf


+ 4 - 7
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.build_log.htm

@@ -27,12 +27,9 @@ Project File Date:  06/15/2022
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'E:\keil530\Keil_v5\ARM\ARMCC\Bin'
 Build target 'Shoes_FW_APP'
-compiling fml_single_line_simplex.c...
 compiling app_single_line_pair.c...
-compiling usr.c...
-compiling bll_single_line_half_duplex.c...
 linking...
-Program Size: Code=153184 RO-data=4152 RW-data=3516 ZI-data=30884  
+Program Size: Code=153232 RO-data=4032 RW-data=3516 ZI-data=30884  
 FromELF: creating hex file...
 ".\_build\nrf52832_xxaa.axf" - 0 Error(s), 0 Warning(s).
 
@@ -60,11 +57,11 @@ Package Vendor: NordicSemiconductor
    * 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_nrf52.h
-      Include file:  Device\Include\system_nrf.h
       Source file:   Device\Source\system_nrf52.c
-Build Time Elapsed:  00:00:08
+      Source file:   Device\Source\arm\arm_startup_nrf52.s
+      Include file:  Device\Include\system_nrf.h
+Build Time Elapsed:  00:00:06
 </pre>
 </body>
 </html>

ファイルの差分が大きいため隠しています
+ 262 - 262
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.hex


+ 24 - 24
shoe_mcu2.2.1_new_v2/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: Mon Jun 20 18:02:56 2022
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Wed Jun 29 14:31:17 2022
 <BR><P>
 <H3>Maximum Stack Usage =       5152 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -765,7 +765,8 @@ Global Symbols
 <P><STRONG><a name="[23c]"></a>memcmp</STRONG> (Thumb, 26 bytes, Stack size 12 bytes, memcmp.o(.text))
 <BR><BR>[Stack]<UL><LI>Max Depth = 12<LI>Call Chain = memcmp
 </UL>
-<BR>[Called By]<UL><LI><a href="#[30e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;fml_imu_start_config
+<BR>[Called By]<UL><LI><a href="#[7c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;app_single_line_pair_save_adv_or_scan_Process
+<LI><a href="#[30e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;fml_imu_start_config
 <LI><a href="#[487]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;minfds_record_update
 <LI><a href="#[485]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;minfds_record_find_mem
 <LI><a href="#[483]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;minfds_record_delete
@@ -2072,7 +2073,6 @@ Global Symbols
 <LI><a href="#[442]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;hal_wearshoes_determine
 <LI><a href="#[a5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;hal_wearshoes_Process
 <LI><a href="#[9f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;cb_BLE_Client_ERR
-<LI><a href="#[9a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;fml_single_line_in_pin_handler
 <LI><a href="#[a4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;hal_qma_Porcess
 <LI><a href="#[366]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;drv_lsm_self_check_5
 <LI><a href="#[353]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;drv_lsm_self_check_1
@@ -6469,9 +6469,9 @@ Global Symbols
 <BR>[Calls]<UL><LI><a href="#[4cd]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;addr_is_within_bounds
 <LI><a href="#[4cc]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;addr_is_page_aligned
 </UL>
-<BR>[Called By]<UL><LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
-<LI><a href="#[422]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_swap_erase
+<BR>[Called By]<UL><LI><a href="#[422]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_swap_erase
 <LI><a href="#[41d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_page_erase
+<LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
 </UL>
 
 <P><STRONG><a name="[d9]"></a>nrf_fstorage_sdh_req_handler</STRONG> (Thumb, 22 bytes, Stack size 0 bytes, nrf_fstorage_sd.o(i.nrf_fstorage_sdh_req_handler))
@@ -8375,7 +8375,7 @@ Local Symbols
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> app_single_line_pair.o(i.app_single_line_pair_Init)
 </UL>
-<P><STRONG><a name="[7c]"></a>app_single_line_pair_save_adv_or_scan_Process</STRONG> (Thumb, 546 bytes, Stack size 40 bytes, app_single_line_pair.o(i.app_single_line_pair_save_adv_or_scan_Process))
+<P><STRONG><a name="[7c]"></a>app_single_line_pair_save_adv_or_scan_Process</STRONG> (Thumb, 614 bytes, Stack size 40 bytes, app_single_line_pair.o(i.app_single_line_pair_save_adv_or_scan_Process))
 <BR><BR>[Stack]<UL><LI>Max Depth = 4848<LI>Call Chain = app_single_line_pair_save_adv_or_scan_Process &rArr; slave_adv_init &rArr; advertising_init &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="#[11a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;TIME_GetTicks
@@ -8399,6 +8399,7 @@ Local Symbols
 <LI><a href="#[250]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;host_isconnect
 <LI><a href="#[254]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;host_set_scan_name
 <LI><a href="#[13b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__2sprintf
+<LI><a href="#[23c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;memcmp
 <LI><a href="#[133]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;strlen
 <LI><a href="#[13a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memclr4
 </UL>
@@ -8785,11 +8786,10 @@ Local Symbols
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> hal_qma.o(i.hal_qma_Init)
 </UL>
-<P><STRONG><a name="[9a]"></a>fml_single_line_in_pin_handler</STRONG> (Thumb, 1266 bytes, Stack size 64 bytes, fml_single_line_simplex.o(i.fml_single_line_in_pin_handler))
-<BR><BR>[Stack]<UL><LI>Max Depth = 432<LI>Call Chain = fml_single_line_in_pin_handler &rArr; SEGGER_RTT_printf &rArr; SEGGER_RTT_vprintf &rArr; _PrintInt &rArr; _PrintUnsigned &rArr; _StoreChar &rArr; SEGGER_RTT_Write &rArr; SEGGER_RTT_WriteNoLock &rArr; _WriteNoCheck
+<P><STRONG><a name="[9a]"></a>fml_single_line_in_pin_handler</STRONG> (Thumb, 1224 bytes, Stack size 48 bytes, fml_single_line_simplex.o(i.fml_single_line_in_pin_handler))
+<BR><BR>[Stack]<UL><LI>Max Depth = 136<LI>Call Chain = fml_single_line_in_pin_handler &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
 </UL>
-<BR>[Calls]<UL><LI><a href="#[128]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;SEGGER_RTT_printf
-<LI><a href="#[f6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ui2d
+<BR>[Calls]<UL><LI><a href="#[f6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ui2d
 <LI><a href="#[f4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_ddiv
 <LI><a href="#[f8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_d2uiz
 <LI><a href="#[3f8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;nrfx_gpiote_in_is_set
@@ -8895,8 +8895,8 @@ Local Symbols
 <BR>[Calls]<UL><LI><a href="#[282]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Process_Stop
 <LI><a href="#[132]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Except_TxError
 </UL>
-<BR>[Address Reference Count : 2]<UL><LI> bsp_time.o(i.bsp_rtc_init_process)
-<LI> bsp_time.o(i.TIME_Init)
+<BR>[Address Reference Count : 2]<UL><LI> bsp_time.o(i.TIME_Init)
+<LI> bsp_time.o(i.bsp_rtc_init_process)
 </UL>
 <P><STRONG><a name="[53]"></a>cb_timeeWakeup</STRONG> (Thumb, 12 bytes, Stack size 0 bytes, bsp_time.o(i.cb_timeeWakeup))
 <BR>[Address Reference Count : 1]<UL><LI> bsp_time.o(i.TIME_Init)
@@ -9005,8 +9005,8 @@ Local Symbols
 <BR>[Calls]<UL><LI><a href="#[282]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Process_Stop
 <LI><a href="#[132]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Except_TxError
 </UL>
-<BR>[Address Reference Count : 2]<UL><LI> bsp_adc.o(i.ADC_Init)
-<LI> bsp_adc.o(i.bsp_adc_init_process)
+<BR>[Address Reference Count : 2]<UL><LI> bsp_adc.o(i.bsp_adc_init_process)
+<LI> bsp_adc.o(i.ADC_Init)
 </UL>
 <P><STRONG><a name="[3d]"></a>cb_adcSleep</STRONG> (Thumb, 10 bytes, Stack size 8 bytes, bsp_adc.o(i.cb_adcSleep))
 <BR><BR>[Stack]<UL><LI>Max Depth = 72<LI>Call Chain = cb_adcSleep &rArr; ADC_Disable &rArr; nrfx_saadc_uninit &rArr; nrfx_saadc_channel_uninit &rArr; nrfx_saadc_limits_set
@@ -12857,8 +12857,8 @@ Local Symbols
 </UL>
 <BR>[Calls]<UL><LI><a href="#[423]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;nrf_fstorage_write
 </UL>
-<BR>[Called By]<UL><LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
-<LI><a href="#[41e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_swap_promote
+<BR>[Called By]<UL><LI><a href="#[41e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_swap_promote
+<LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
 </UL>
 
 <P><STRONG><a name="[429]"></a>page_tag_write_swap</STRONG> (Thumb, 22 bytes, Stack size 8 bytes, fds.o(i.page_tag_write_swap))
@@ -12866,8 +12866,8 @@ Local Symbols
 </UL>
 <BR>[Calls]<UL><LI><a href="#[423]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;nrf_fstorage_write
 </UL>
-<BR>[Called By]<UL><LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
-<LI><a href="#[41f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_tag_new_swap
+<BR>[Called By]<UL><LI><a href="#[41f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_tag_new_swap
+<LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
 </UL>
 
 <P><STRONG><a name="[3d4]"></a>queue_buf_get</STRONG> (Thumb, 28 bytes, Stack size 16 bytes, fds.o(i.queue_buf_get))
@@ -12916,8 +12916,7 @@ Local Symbols
 <P><STRONG><a name="[40e]"></a>queue_process</STRONG> (Thumb, 186 bytes, Stack size 32 bytes, fds.o(i.queue_process))
 <BR><BR>[Stack]<UL><LI>Max Depth = 144<LI>Call Chain = queue_process &rArr; delete_execute &rArr; record_find_and_delete &rArr; record_header_flag_dirty &rArr; nrf_fstorage_write &rArr; addr_is_within_bounds
 </UL>
-<BR>[Calls]<UL><LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
-<LI><a href="#[418]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_execute
+<BR>[Calls]<UL><LI><a href="#[418]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_execute
 <LI><a href="#[564]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;event_send
 <LI><a href="#[563]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;event_prepare
 <LI><a href="#[337]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;delete_execute
@@ -12925,6 +12924,7 @@ Local Symbols
 <LI><a href="#[55d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;queue_load
 <LI><a href="#[55c]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;queue_has_next
 <LI><a href="#[55b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;queue_free
+<LI><a href="#[45a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;init_execute
 <LI><a href="#[13a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;__aeabi_memclr4
 </UL>
 <BR>[Called By]<UL><LI><a href="#[7]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;fs_event_handler
@@ -12977,9 +12977,9 @@ Local Symbols
 <P><STRONG><a name="[424]"></a>record_find_next</STRONG> (Thumb, 116 bytes, Stack size 24 bytes, fds.o(i.record_find_next))
 <BR><BR>[Stack]<UL><LI>Max Depth = 40<LI>Call Chain = record_find_next &rArr; header_check
 </UL>
-<BR>[Calls]<UL><LI><a href="#[444]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;header_jump
-<LI><a href="#[567]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;header_has_next
+<BR>[Calls]<UL><LI><a href="#[567]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;header_has_next
 <LI><a href="#[443]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;header_check
+<LI><a href="#[444]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;header_jump
 </UL>
 <BR>[Called By]<UL><LI><a href="#[41b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;gc_record_find_next
 <LI><a href="#[3d8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;record_find_by_desc
@@ -13039,13 +13039,13 @@ Local Symbols
 <P><STRONG><a name="[3e0]"></a>write_enqueue</STRONG> (Thumb, 224 bytes, Stack size 48 bytes, fds.o(i.write_enqueue))
 <BR><BR>[Stack]<UL><LI>Max Depth = 200<LI>Call Chain = write_enqueue &rArr; queue_start &rArr; queue_process &rArr; delete_execute &rArr; record_find_and_delete &rArr; record_header_flag_dirty &rArr; nrf_fstorage_write &rArr; addr_is_within_bounds
 </UL>
-<BR>[Calls]<UL><LI><a href="#[23e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;is_word_aligned
-<LI><a href="#[59e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;write_space_reserve
+<BR>[Calls]<UL><LI><a href="#[59e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;write_space_reserve
 <LI><a href="#[59f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;write_space_free
 <LI><a href="#[56b]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;record_id_new
 <LI><a href="#[3d6]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;queue_start
 <LI><a href="#[3d5]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;queue_buf_store
 <LI><a href="#[3d4]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;queue_buf_get
+<LI><a href="#[23e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;is_word_aligned
 </UL>
 <BR>[Called By]<UL><LI><a href="#[3e1]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;fds_record_write
 <LI><a href="#[3df]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;fds_record_update

ファイルの差分が大きいため隠しています
+ 1876 - 1878
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.map


BIN
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf_pwr_mgmt.crf


BIN
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/_build/nrf_pwr_mgmt.o


ファイルの差分が大きいため隠しています
+ 9 - 9
shoe_mcu2.2.1_new_v2/pca10040/s132/arm5_no_packs/ble_app_uart_c_pca10040_s132.uvguix.Administrator


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません