解决OTA失败一分钟之后右鞋名字不对的问题

app/app_ota.c

@@ -122,7 +122,7 @@ static void app_ota_Process(void)
 			slave_set_adv_name((char *)RIGHT_NAME,sizeof(RIGHT_NAME));
 			DEBUG_LOG("AdvName(%d):%s\n",sizeof(RIGHT_NAME),RIGHT_NAME);
 		  #else
-			sprintf(buf,"%02X%02X%02X%02X%02X%02X",mFlash.mClient.macAddr[0],mFlash.mClient.macAddr[1],mFlash.mClient.macAddr[2],mFlash.macHost[3],mFlash.macHost[4],mFlash.macHost[5]);
+			sprintf(buf,"%02X%02X%02X%02X%02X%02X",mFlash.macHost[0],mFlash.macHost[1],mFlash.macHost[2],mFlash.mClient.macAddr[3],mFlash.mClient.macAddr[4],mFlash.mClient.macAddr[5]);
 			
 			DEBUG_LOG("ADV name(%d):%s\n",strlen(buf),buf);
 			slave_set_adv_name(buf,strlen(buf));

dfu_readme/app_setting.hex

@@ -1,6 +1,6 @@
 :020000040007F3
-:10E000009382168F02000000010000000100000052
-:10E010000000000000000000CCF401004DA12DA282
+:10E000004855E1EF0200000001000000010000009F
+:10E010000000000000000000CCF401002F90056B10
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -36,12 +36,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000D54CE2E9D2
+:10E25000000000000000000000000000CF76E56232
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A00000014DA12DA200000000000000000000B0
+:10E2A00000012F90056B000000000000000000003E
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -50,8 +50,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F000009382168F02000000010000000100000042
-:10F010000000000000000000CCF401004DA12DA272
+:10F000004855E1EF0200000001000000010000008F
+:10F010000000000000000000CCF401002F90056B00
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -87,12 +87,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000D54CE2E9C2
+:10F25000000000000000000000000000CF76E56222
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A00000014DA12DA200000000000000000000A0
+:10F2A00000012F90056B000000000000000000002E
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

dfu_readme/setting_sd_boot.hex

@@ -11063,8 +11063,8 @@
 :10DF600000000000000000000000000000000000B1
 :10DF7000000000000090D00300000000000000003E
 :0CDF800085A6070000100000000008004B
-:10E000009382168F02000000010000000100000052
-:10E010000000000000000000CCF401004DA12DA282
+:10E000004855E1EF0200000001000000010000009F
+:10E010000000000000000000CCF401002F90056B10
 :10E0200001000000000000000000000000000000EF
 :10E0300000000000000000000000000000000000E0
 :10E0400000000000000000000000000000000000D0
@@ -11100,12 +11100,12 @@
 :10E2200000000000000000000000000000000000EE
 :10E2300000000000000000000000000000000000DE
 :10E2400000000000000000000000000000000000CE
-:10E25000000000000000000000000000D54CE2E9D2
+:10E25000000000000000000000000000CF76E56232
 :10E2600000000000000000000000000000000000AE
 :10E27000000000000000000000000000000000009E
 :10E28000000000000000000000000000000000008E
 :10E29000000000000000000000000000000000007E
-:10E2A00000014DA12DA200000000000000000000B0
+:10E2A00000012F90056B000000000000000000003E
 :10E2B000000000000000000000000000000000005E
 :10E2C000000000000000000000000000000000004E
 :10E2D000000000000000000000000000000000003E
@@ -11114,8 +11114,8 @@
 :10E30000000000000000000000000000000000000D
 :10E3100000000000000000000000000000000000FD
 :04E32000000000FFFA
-:10F000009382168F02000000010000000100000042
-:10F010000000000000000000CCF401004DA12DA272
+:10F000004855E1EF0200000001000000010000008F
+:10F010000000000000000000CCF401002F90056B00
 :10F0200001000000000000000000000000000000DF
 :10F0300000000000000000000000000000000000D0
 :10F0400000000000000000000000000000000000C0
@@ -11151,12 +11151,12 @@
 :10F2200000000000000000000000000000000000DE
 :10F2300000000000000000000000000000000000CE
 :10F2400000000000000000000000000000000000BE
-:10F25000000000000000000000000000D54CE2E9C2
+:10F25000000000000000000000000000CF76E56222
 :10F26000000000000000000000000000000000009E
 :10F27000000000000000000000000000000000008E
 :10F28000000000000000000000000000000000007E
 :10F29000000000000000000000000000000000006E
-:10F2A00000014DA12DA200000000000000000000A0
+:10F2A00000012F90056B000000000000000000002E
 :10F2B000000000000000000000000000000000004E
 :10F2C000000000000000000000000000000000003E
 :10F2D000000000000000000000000000000000002E

pca10040/s132/arm5_no_packs/_build/nrf52832_xxaa.build_log.htm

@@ -54,10 +54,10 @@ 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
+      Include file:  Device\Include\system_nrf52.h
+      Source file:   Device\Source\arm\arm_startup_nrf52.s
 Build Time Elapsed:  00:00:02
 </pre>
 </body>

system/usr_config.h

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