合并代码并备份

app/app_chargerpin_conn_detect.c

@@ -1,4 +1,4 @@
-#include "app_chargerpin_conn_detect.h"
+#include "app_chargerpin_conn_detect.h"
 #include "system.h"
 #include "bsp_time.h"
 #include "bsp_adc.h"
@@ -274,7 +274,7 @@ static void app_pair_host_process(void)
 			case 2:
 			
 				break;
-			case 3://é?à-è?′ó?ú·￠??????D?o?
+			case 3://¨¦?¨¤-¨¨?¡ä¨®?¨²¡¤¡é??????D?o?
 				if ((TIME_GetTicks() - host_ram.delay_pair_count > ADC_CHECKMS+ADC_CHECKMS))
 				{
 					PAIR_CHARGERPIN_PRINT(" UP pull over time  %d \n", TIME_GetTicks());
@@ -284,7 +284,7 @@ static void app_pair_host_process(void)
 					Process_SetHoldOn(app_pair_host_process,0);
 					host_ram.statu=1;
 				}
-				else if(nrf_gpio_pin_read(PIN_CHARGING))//?áμ?é?à-D?o?ò?oó￡??μ?÷clientò??-á??óé?
+				else if(nrf_gpio_pin_read(PIN_CHARGING))//?¨¢¦Ì?¨¦?¨¤-D?o?¨°?o¨®¡ê??¦Ì?¡Âclient¨°??-¨¢??¨®¨¦?
 				{
 					PAIR_CHARGERPIN_PRINT(" nrf_gpio_pin_read(PIN_CHARGING SUCCESS \n", TIME_GetTicks());
 					host_ram.statu=4;
@@ -355,7 +355,7 @@ static void app_pair_host_process(void)
 
 
 #define CONN_MAX_ADC 1000
-#define CONN_MIN_ADC 750
+#define CONN_MIN_ADC 600
 void app_pair_client_init(Event into,Event over)
 {
 	client_ram.init=1;
@@ -395,7 +395,7 @@ void app_pair_client_process_case1(void)
 						client_ram.pair_line=CHARGE;
 					}
 				}
-				else if((client_ram.adc_value>CONN_MIN_ADC)&&(client_ram.adc_value < CONN_MIN_ADC+100))
+				else if(client_ram.adc_value>CONN_MIN_ADC)
 				{
 					PAIR_CHARGERPIN_PRINT("CONNECT_NO_CHARGE\n");
 					if(client_ram.pair_line!=CONNECT_NO_CHARGE)
@@ -415,7 +415,7 @@ void app_pair_client_process_case1(void)
 							NRF_GPIO_PIN_D0H1,
 							NRF_GPIO_PIN_NOSENSE);
 						nrf_gpio_cfg_watcher(PIN_CHARGING);
-						nrf_gpio_pin_set(PIN_CHARGING);//à-??100ms
+						nrf_gpio_pin_set(PIN_CHARGING);//¨¤-??100ms
 						
 						client_ram.delay_pair_count=TIME_GetTicks();
 						Process_UpdatePeroid(app_pair_client_process,1);
@@ -475,7 +475,7 @@ static void app_pair_client_process(void)
 	
 				break;
 			case 2:
-				if(TIME_GetTicks() - client_ram.delay_pair_count > 100)//μè100ms
+				if(TIME_GetTicks() - client_ram.delay_pair_count > 100)//¦Ì¨¨100ms
 				{
 					nrf_gpio_pin_clear(PIN_CHARGING);
 					client_ram.statu=3;

app/app_connect_manage.c

@@ -101,11 +101,7 @@ static void cb_BLE_BLINK_LED(void* handle)
 	BLE_Host_Tx_Send(0,BLE_BLINK_LED,buf,2); 
 	Process_SetHoldOn(app_connect_LED_Process,1);
 	LedBlinktim = TIME_GetTicks();
-	if(GetBatteryPersent()>20){
-		LED_Start(LED_OVERTURN,COLOR_GREEN);
-	}else{
-		LED_Start(LED_OVERTURN,COLOR_ORANGE);
-	}
+	LED_Start(LED_OVERTURN,COLOR_GREEN);
 }
 
 void cb_Slave_Connect(void)

app/app_pair_chargerpin.c

@@ -55,7 +55,7 @@ void stop_pair_led(void)
 }
 void open_white(void)
 {
-	LED_Start(LED_PAIR, COLOR_WHITE);
+	LED_Start(LED_PAIR, COLOR_LOWWHITE);
 	
 	PAIR_CHARGERPIN_PRINT("  ======================open_white open_white============================= \n");
 	open=1;

app/app_pair_chargerpin.c.bak

@@ -0,0 +1,348 @@
+#include "usr_config.h"
+#include "bsp_time.h"
+#include "selfcheck.h"
+#include "system.h"
+#include "nrf_gpio.h"
+#include "app_charge.h"
+#include "app_flash.h"
+#include "ble_comm.h"
+#include "bsp_adc.h"
+#include "app_pair_chargerpin.h"
+#include "app_chargerpin_conn_detect.h"
+#include "hal_led.h"
+#include "hal_charge.h"
+#include "hal_mt.h"
+#include "app_one_wire.h"
+//==========================================================================
+char open=0;
+static uint8_t leddisplay_count = 0;
+void pair_led_pcs(void)
+{
+    leddisplay_count++;
+    if (leddisplay_count % 2 == 0)
+    {
+        LED_Start(LED_PAIR, COLOR_BLACK);
+    }
+    else
+    {
+        LED_Start(LED_PAIR, COLOR_WHITE);
+    }
+    if (leddisplay_count > 20)
+    {
+        leddisplay_count = 0;
+        LED_Stop(LED_PAIR);
+        Process_SetHoldOn(pair_led_pcs, 0);
+        Process_Stop(pair_led_pcs);
+    }
+}
+extern void close_white(void);
+void start_pair_led(void)
+{
+	close_white();
+	leddisplay_count = 0;
+  Process_Start(500, "pair_led_pcs", pair_led_pcs);
+  Process_SetHoldOn(pair_led_pcs, 1);
+}
+void stop_pair_led(void)
+{
+    if (leddisplay_count == 0)
+    {
+      return;
+    }
+    Process_Stop(pair_led_pcs);
+    leddisplay_count = 0;
+		LED_Stop(LED_PAIR);
+}
+void open_white(void)
+{
+	LED_Start(LED_PAIR, COLOR_WHITE);
+	
+	PAIR_CHARGERPIN_PRINT("  ======================open_white open_white============================= \n");
+	open=1;
+}
+
+void close_white(void)
+{
+	open=0;
+	LED_Stop(LED_PAIR);
+}
+char white_isopen(void)
+{
+	return open;
+}
+
+void r_led_start(void)
+{
+	stop_pair_led();
+	open_white();
+}
+PAIR_START_REGISTER(r_led_start);
+
+void r_led_done(void)
+{
+	if(leddisplay_count!=0)open=0;
+	else close_white();
+}
+PAIR_DONE_REGISTER(r_led_done);
+//===========================================================================================
+
+//写配对相关的flish
+static int pair_writeflish(unsigned char *macAddr_L, unsigned char *macAddr_R)
+{
+    uint8_t offest = 0;
+    if (mFlash.isHost)
+    {
+        offest = 3;
+    }
+    if (memcmp(macAddr_R, mFlash.mClient.macAddr + offest, 3) != 0)
+    {
+        goto writein;
+    }
+    if (mFlash.mClient.isConfig != 'C')
+    {
+        goto writein;
+    }
+    PAIR_CHARGERPIN_PRINT("mFlash.mClient.isConfig:%X\n", mFlash.mClient.isConfig);
+    PAIR_CHARGERPIN_PRINT("mFlash.mClient.macAddr:%02X %02X %02X\n", mFlash.mClient.macAddr[0], mFlash.mClient.macAddr[1], mFlash.mClient.macAddr[2]);
+    PAIR_CHARGERPIN_PRINT("mFlash.macHost:%02X %02X %02X\n", mFlash.macHost[0], mFlash.macHost[1], mFlash.macHost[2]);
+    return 0;
+writein:
+    mFlash.mClient.isConfig = 'C';
+    uint8_t i = 0;
+    for (i = 0; i < 6; i++)
+    {
+        mFlash.macHost[i] = macAddr_L[i];
+    }
+    for (i = 0; i < 3; i++)
+    {
+        mFlash.mClient.macAddr[i + offest] = macAddr_R[i]; //从机自身mac地址
+    }
+    //保存数据到备份区域里面
+    for (i = 0; i < RecordMacAddrL; i++)
+    {
+        mBackup.macAddr_L[i] = mFlash.macHost[i];         //主机地址
+        mBackup.macAddr_R[i] = mFlash.mClient.macAddr[i]; //从机地址
+    }
+    mBackup.hardVersion = mFlash.mClient.hardVersion;
+    mBackup.sotfVersion = mFlash.mClient.sotfVersion;
+    mBackup.isConfig = mFlash.mClient.isConfig;
+    if (Flash_SaveBackup() != ZONE_OP_SUCCESS)
+    {
+        Except_TxError(EXCEPT_Pair, "pair save backup fail");
+    }
+    DEBUG_LOG("mFlash.mClient.isConfig:%X\n", mFlash.mClient.isConfig);
+    DEBUG_LOG("mFlash.mClient.macAddr:%02X %02X %02X\n", mFlash.mClient.macAddr[0], mFlash.mClient.macAddr[1], mFlash.mClient.macAddr[2]);
+    DEBUG_LOG("mFlash.macHost:%02X %02X %02X \n", mFlash.macHost[0], mFlash.macHost[1], mFlash.macHost[2]);
+    if (Flash_DeleteAllStep() != ZONE_OP_SUCCESS)
+    {
+        Except_TxError(EXCEPT_Pair, "pair clear step fail");
+        return 0;
+    }
+    memset(&mFlash.mStep, 0, sizeof(FlashStep_t));
+    if (Flash_SaveInfomation() != ZONE_OP_SUCCESS)
+    {
+        Except_TxError(EXCEPT_Pair, "Flash_SaveInfomation fail");
+        return 0;
+    }
+    return 1;
+}
+
+static void load_adv_name_from_flish(void)
+{
+    char buf[16];
+    memset(buf, 0, sizeof(buf));
+    advertising_stop();
+    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]);
+    DEBUG_LOG("advName(%d):%s\n", strlen(buf), buf);
+    slave_set_adv_name(buf, strlen(buf));
+    slave_adv_init();
+}
+
+static void load_scan_name_from_flish(void)
+{
+    char buf[16];
+    memset(buf, 0, sizeof(buf));
+    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("scanName1(%d):%s\n", strlen(buf), buf);
+    host_set_scan_name(buf, strlen(buf));
+}
+static unsigned char reconnect_pcs_status = 0;
+static void reconnect_pcs(void)
+{
+    switch (reconnect_pcs_status)
+    {
+    case 0:
+        if (mFlash.isHost)
+        {
+            reconnect_pcs_status = 1;
+            if (host_isconnect() == 1)
+            {
+                host_disconnect();
+            }
+        }
+        else
+        {
+            reconnect_pcs_status = 2;
+            if (slave_isconnect() == 1)
+            {
+                slave_disconnect();
+            }
+        }
+        break;
+    case 1:
+        if (host_isconnect() == 0)
+        {
+            load_scan_name_from_flish();
+            scan_start();
+            reconnect_pcs_status = 4;
+        }
+        break;
+    case 2:
+        if (slave_isconnect() == 0)
+        {
+            load_adv_name_from_flish();
+            advertising_start();
+            reconnect_pcs_status = 4;
+        }
+        break;
+    case 4:
+        Process_SetHoldOn(reconnect_pcs, 0);
+        Process_Stop(reconnect_pcs);
+        reconnect_pcs_status = 5;
+		
+				start_pair_led();
+        break;
+    case 5:
+        break;
+    }
+}
+//===========================================================================================================
+extern void app_pair_chargerpin_pcs(void);
+void delsiflash(void)
+{
+	app_pair_chargerpin_pcs();
+	Process_Stop(delsiflash);
+}
+__IO static char writefig=0;
+unsigned char *savebuf;
+void sucess_ev_cb(unsigned char *buf,int len)
+{
+	writefig=1;
+	savebuf=buf;
+	PAIR_CHARGERPIN_PRINT("  ======================PAIR SUCCESS============================= \n");
+	Process_Start(10, "delsiflash", delsiflash);
+}
+void app_pair_chargerpin_pcs(void)
+{
+    int rev = 0;
+    if (writefig == 1)
+    {
+        unsigned char Lbuff[6];
+        unsigned char Rbuff[3];
+        Get_MACaddr(Lbuff);
+        Rbuff[0] = savebuf[0];
+        Rbuff[1] = savebuf[1];
+        Rbuff[2] = savebuf[2];
+        rev = pair_writeflish(Lbuff, Rbuff);
+        if (rev)
+        {
+            Process_Start(10, "reconnect_pcs", reconnect_pcs);
+            Process_SetHoldOn(reconnect_pcs, 1);
+            reconnect_pcs_status = 0;
+        }
+        else
+        {
+						start_pair_led();
+        }
+        writefig = 0;
+    }
+}
+//======================================================================
+void pair_start_pcs(void)
+{
+    extern void *pair_start$$Base;
+    extern void *pair_start$$Limit;
+    typedef void (*main_init_t)(void);
+    for (int p = (unsigned int)&pair_start$$Base; p < (unsigned int)&pair_start$$Limit; p += 4)
+    {
+        (*(main_init_t *)p)();
+    }
+}
+
+void pair_done_pcs(void)
+{
+    extern void *pair_done$$Base;
+    extern void *pair_done$$Limit;
+    typedef void (*main_init_t)(void);
+    for (int p = (unsigned int)&pair_done$$Base; p < (unsigned int)&pair_done$$Limit; p += 4)
+    {
+        (*(main_init_t *)p)();
+    }
+}
+
+//=================================================================================================
+void send_start(void)
+{
+#define DELAY_PAIR_COUNT 100
+	static unsigned int delay_pair_count=0;
+	static char status=0;
+	switch(status)
+	{
+		case 0:
+			delay_pair_count=TIME_GetTicks();
+			Process_Start(1, "send_start", send_start);
+			Process_SetHoldOn(send_start, 1);
+			status=2;
+			break;
+		case 2:
+			if(nrf_gpio_pin_read(PIN_CHARGING)==0)
+			{
+				PAIR_CHARGERPIN_PRINT("  ==============================nrf_gpio_pin_read(PIN_CHARGING)==0 \n");
+				status=3;
+			}
+			break;
+    case 3:
+        if (TIME_GetTicks() - delay_pair_count > DELAY_PAIR_COUNT)
+        {
+            delay_pair_count = TIME_GetTicks();
+            nrf_gpio_pin_set(PIN_CHARGING);
+            PAIR_CHARGERPIN_PRINT("  SEND PAIR TAG HIG; %d \n", TIME_GetTicks());
+            status = 4;
+        }
+        break;
+    case 4:
+        if (TIME_GetTicks() - delay_pair_count > (DELAY_PAIR_COUNT + 100))
+        {
+            nrf_gpio_pin_clear(PIN_CHARGING);
+            PAIR_CHARGERPIN_PRINT("  SEND PAIR TAG LOW; %d \n", TIME_GetTicks());
+            status = 0;
+						Process_Stop(send_start);
+        }
+        break;
+	}
+}
+
+void into_event(void)
+{
+	chargerpin_one_ms_init(sucess_ev_cb);
+	pair_start_pcs();
+	if(mFlash.isHost==1)
+	{
+		send_start();
+	}
+}
+void over_event(void)
+{
+	chargerpin_one_ms_uninit();
+	pair_done_pcs();
+}
+
+void app_pair_chargerpin_Init(void)
+{
+	check_callback_regist(selfcheck_trigger_callback);
+//	mFlash.isHost=0;
+	if(mFlash.isHost!=HOST_SHOSE)
+		app_pair_client_init(into_event,over_event);
+	if(mFlash.isHost==HOST_SHOSE)
+		app_pair_host_init(into_event,over_event);
+}

hal/hal_led/hal_led.h

@@ -30,7 +30,8 @@
 
 
 #define COLOR_BLACK                0xFF000000
-#define COLOR_WHITE                0x0F0F0F0F
+#define COLOR_LOWWHITE             0x0F0F0F0F
+#define COLOR_WHITE                0x2F2F2F2F
 #define COLOR_RED                  0xFFFF0000
 #define COLOR_LIGHRED              0xFF070000
 #define COLOR_GREEN                0xFF007F00

hal/hal_led/hal_led.h.bak

@@ -0,0 +1,81 @@
+#ifndef __hal_led_h__
+#define __hal_led_h__
+#include <stdbool.h>
+#include <stdint.h>
+#include <string.h>
+#include "sdk_common.h"
+#include "SEGGER_RTT.h"
+#include "usr_config.h"
+
+//ARGB
+//#define COLOR_BLACK					0xFF000000
+//#define COLOR_WHITE					0xFF070707
+//#define COLOR_RED		  			0xFF070000
+//#define COLOR_GREEN					0xFF000700
+//#define COLOR_BLUE					0xFF000007
+//#define COLOR_ORANGE				0xFF070300
+//#define COLOR_PURPLE				0xFF070007
+//#define COLOR_YELLOW				0xFF070700
+//#define COLOR_CYAN					0xFF000707
+
+//#define COLOR_BLACK		0xFF000000
+//#define COLOR_WHITE		0xFFFFFFFF
+//#define COLOR_RED		  0xFFFF0000
+//#define COLOR_GREEN		0xFF00FF00
+//#define COLOR_BLUE		0xFF0000FF
+//#define COLOR_ORANGE	0xFFFF6000
+//#define COLOR_PURPLE	0xFFFF00FF
+//#define COLOR_YELLOW	0xFFFFFF00
+//#define COLOR_CYAN		0xFF00FFFF
+
+
+#define COLOR_BLACK                0xFF000000
+#define COLOR_WHITE                0x0F0F0F0F
+#define COLOR_RED                  0xFFFF0000
+#define COLOR_LIGHRED              0xFF070000
+#define COLOR_GREEN                0xFF007F00
+#define COLOR_BLUE                 0xFF0000FF
+#define COLOR_ORANGE               0xFF6F1000
+#define COLOR_PURPLE               0xFFFF00FF
+#define COLOR_YELLOW               0xFFFFFF00
+#define COLOR_CYAN                 0xFF000707
+
+#define LED_ENABLE						0
+#define LED_DISABLE						1
+
+
+////显示优先级 0~250
+//enum {
+//	LED_PRIO_NONE = 0,	//保留
+//	LED_PRIO_OVERTURN,	//翻转显示电量
+//	LED_PRIO_CHARGE,	//充电显示电量
+//	
+//};	
+
+//显示优先级 0~250
+enum {
+	LED_NONE = 0,	  //保留
+	LED_RUN,		    //测试灯
+	LED_CONNECT,	  //连接完成灯
+	LED_SELF_CHECK,	//自检灯
+	LED_OVERTURN,	  //翻转显示电量
+	LED_CHARGE,		  //充电显示电量
+	LED_PAIR,       //匹配完成灯 
+	LED_EXCEPT,     //故障灯
+	LED_RESTART,    //重启亮灯
+	LED_NUM_OF_LED,	//LED成员变量
+};
+
+void LED_Init(void);
+void LED_Stop(uint8_t n);
+void LED_Start(uint8_t n,uint32_t color);
+void LED_Close_Enforce(void);
+void LED_SetColor(uint8_t n,uint32_t color);
+
+void WS2812_DisplayDot(uint32_t col);
+void WS2812_Pwm_Play(void);
+
+#endif
+
+
+

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

@@ -27,7 +27,6 @@ Project File Date:  08/03/2022
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 6 (build 750)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Build target 'Shoes_FW_APP'
-FromELF: creating hex file...
 ".\_build\nrf52832_xxaa.axf" - 0 Error(s), 0 Warning(s).
 
 <h2>Software Packages used:</h2>
@@ -54,11 +53,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_nrf.h
       Source file:   Device\Source\system_nrf52.c
       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>

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 Aug 09 10:33:12 2022
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Tue Aug 09 18:55:45 2022
 <BR><P>
 <H3>Maximum Stack Usage =       5152 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -1470,7 +1470,6 @@ Global Symbols
 <LI><a href="#[54]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;app_BatDispaly_Process_N
 <LI><a href="#[70]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;app_BatDispaly_Process
 <LI><a href="#[47]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;PWR_Process
-<LI><a href="#[5f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;cb_BLE_BLINK_LED
 <LI><a href="#[2fd]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;hal_charge_Vol_Charge_Send
 <LI><a href="#[9f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;hal_charge_Process
 </UL>
@@ -4046,7 +4045,7 @@ Global Symbols
 <BR>[Called By]<UL><LI><a href="#[81]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;app_math_DailyStep_Process
 </UL>
 
-<P><STRONG><a name="[31d]"></a>detect_zero_vel</STRONG> (Thumb, 1272 bytes, Stack size 96 bytes, detect_zero_vel.o(i.detect_zero_vel))
+<P><STRONG><a name="[31d]"></a>detect_zero_vel</STRONG> (Thumb, 1268 bytes, Stack size 96 bytes, detect_zero_vel.o(i.detect_zero_vel))
 <BR><BR>[Stack]<UL><LI>Max Depth = 128<LI>Call Chain = detect_zero_vel &rArr; isLongTimeDownTrend
 </UL>
 <BR>[Calls]<UL><LI><a href="#[321]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;setZeroStatus
@@ -4736,7 +4735,7 @@ Global Symbols
 <LI><a href="#[2ef]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;bll_imu_start_config
 </UL>
 
-<P><STRONG><a name="[3bf]"></a>footPDR</STRONG> (Thumb, 774 bytes, Stack size 56 bytes, footpdr.o(i.footPDR))
+<P><STRONG><a name="[3bf]"></a>footPDR</STRONG> (Thumb, 710 bytes, Stack size 56 bytes, footpdr.o(i.footPDR))
 <BR><BR>[Stack]<UL><LI>Max Depth = 384<LI>Call Chain = footPDR &rArr; Initialize &rArr; init_attitude_matrix &rArr; __hardfp_sin &rArr; __ieee754_rem_pio2 &rArr; __aeabi_dmul &rArr; _double_epilogue &rArr; _double_round
 </UL>
 <BR>[Calls]<UL><LI><a href="#[3a8]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;estimate_gyr_bias
@@ -7454,13 +7453,12 @@ Local Symbols
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> app_client.o(i.app_client_Initialize)
 </UL>
-<P><STRONG><a name="[5f]"></a>cb_BLE_BLINK_LED</STRONG> (Thumb, 98 bytes, Stack size 16 bytes, app_connect_manage.o(i.cb_BLE_BLINK_LED))
+<P><STRONG><a name="[5f]"></a>cb_BLE_BLINK_LED</STRONG> (Thumb, 80 bytes, Stack size 16 bytes, app_connect_manage.o(i.cb_BLE_BLINK_LED))
 <BR><BR>[Stack]<UL><LI>Max Depth = 608<LI>Call Chain = cb_BLE_BLINK_LED &rArr; BLE_Host_Tx_Send &rArr; BLE_Host_Send &rArr; send_bytes_server &rArr; ble_nus_c_string_send &rArr; nrf_ble_gq_item_add &rArr; queue_process &rArr; nrf_memobj_read &rArr; memobj_op
 </UL>
 <BR>[Calls]<UL><LI><a href="#[10e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;TIME_GetTicks
 <LI><a href="#[110]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Process_SetHoldOn
 <LI><a href="#[11a]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;BLE_Host_Tx_Send
-<LI><a href="#[1ae]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;GetBatteryPersent
 <LI><a href="#[121]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;LED_Start
 </UL>
 <BR>[Address Reference Count : 1]<UL><LI> app_connect_manage.o(i.app_connect_manage_Init)

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

版本更新记录.txt

@@ -1,2 +1,4 @@
-1.  更新算法
-2.  屏蔽hal_minifds的延时
+1.  更新配对阈值
+2.  更新算法
+3.  将手机连接上鞋子统一改成亮绿色
+4.  降低配对时候的长亮白灯的暗度