From 5ee4fd97245fed0d45fb60d1aa38cca83e788ed5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 20 五月 2025 16:13:14 +0800
Subject: [PATCH] 修改了计步逻辑还有蓝牙上传逻辑

---
 keil/include/main/main.c |  137 ++++++++++++++++++++++++++++++++++-----------
 1 files changed, 102 insertions(+), 35 deletions(-)

diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 5d15777..323c301 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -101,6 +101,7 @@
 bool uwb_is_on = false;                                // UWB当前状态标记
 
 void test_Delay_us(uint16_t time);
+int LEDTask(uint8_t Uwb_led,uint8_t Bt_led,uint8_t Lora_led,uint8_t Power_led);
 void Lora_UploadHeartBeartPoll(void);
 void upload_apppoll();
 extern uint8_t mUsartReceivePack[100];
@@ -334,6 +335,8 @@
 extern uint8_t lora_tx_flag;
 extern uint16_t sleep_time;
 uint8_t input5v_time;
+extern uint8_t uwbled,btled,loraled,powerled;
+uint8_t jibu_flag;
 static void sleep_timer_callback(void *dev, uint32_t time)
 {
 	  input5v_time=1;
@@ -341,8 +344,8 @@
 	  HIDO_TimerTick();
 //	  lora_tx_flag++;
 	  uwb_time_count++;
-	  upload_apppoll();
-		step_count = mir3da_get_step(); // 获取步数
+    jibu_flag=1;
+    upload_apppoll();
 
 		if (current_state == STATE_NORMAL)
 	  {
@@ -354,19 +357,18 @@
     {
        if(bat_percent>15)
         {
-					led_state=!led_state;
-					if(led_state)
-					  GREEN_LED_ON;
+					uint8_t state=0;
+					state=!state;
+					if(state==1)
+						GREEN_LED_ON;
 					else
-					{
-					  GREEN_LED_OFF;
-					}
-
+            GREEN_LED_OFF;
+						
+					  
         }
 			else
 				{
-            RED_LED_ON;
-					  GREEN_LED_OFF;
+            powerled=0;
         }
 		}
 		input5v_time=1;
@@ -393,12 +395,14 @@
 }
 uint16_t sleep_time=0;
 uint32_t state_start_time_jibu=0;
+uint8_t exercise_state=0;
 void check_step_and_update_state(void)
 {
     if ((step_count != last_step_count))
 		{
         // 步数有变化,重置状态为正常状态
       last_step_count = step_count;
+			
 			if(current_state == STATE_SLEEP)
 			{
 				state_start_time_jibu = uwb_time_count;
@@ -416,6 +420,7 @@
 //            state_start_time = uwb_time_count; // 重置测距周期
 //        }
 			current_state = STATE_NORMAL;
+			exercise_state=1;
 			last_step_count = step_count;
 			
     } 
@@ -423,11 +428,12 @@
 		{
         // 步数没有变化,检查是否需要切换到休眠状态
         if (current_state == STATE_NORMAL)
-					{
+					{	
             uint32_t inactive_time = uwb_time_count - state_start_time_jibu;
             if (inactive_time >= INACTIVE_TIMEOUT)
 						{ // 30秒后切换到休眠状态
                 current_state = STATE_SLEEP;
+							  exercise_state=2;
 							  state_start_time_jibu=uwb_time_count;
             }
           }
@@ -613,8 +619,8 @@
 						RED_LED_OFF;
 						BT_LED_OFF;				
 	          PCA9555_Set_One_Value_Output(BT_EN,0);
-		        PCA9555_Set_One_Value_Config(BT_IRQ,0);		  //设置BT_IRQ为输出拉低
-	          PCA9555_Set_One_Value_Output(BT_IRQ,0);
+//		        PCA9555_Set_One_Value_Config(BT_IRQ,0);		  //设置BT_IRQ为输出拉低
+//	          PCA9555_Set_One_Value_Output(BT_IRQ,0);
 						sleep_timer_stop();	
             power_enter_power_down_mode(1);
 						sys_reset(0);
@@ -746,6 +752,8 @@
       check_input_change();
 }
 extern uint32_t uwb_time_count;
+uint8_t uwbled,btled,loraled,powerled;
+uint8_t send_count=0;
 void upload_apppoll()
 {	
 	  uint32_t elapsed_time_jibu;
@@ -757,18 +765,21 @@
 				    switch(elapsed_time_jibu)
 						{
 							case UWB_OPEN_COUNT:
-											UWB_LED_OFF;
-							        LORA_LED_OFF;
-							        LoraReportPoll();
-											CloseUWB();	
+							     CloseUWB();					     
+								   LoraReportPoll();
+                   LEDTask(0,0,0,2);
+						
 							break;
 							
 							case UWB_MEASUREMENT_INTERVAL:
-								      PCA9555_Set_One_Value_Output(BT_IRQ ,0);	
-											CloseUWB();
-							        Uwbinit();
-											OpenUWB();					
-                      state_start_time = uwb_time_count;							
+							      LEDTask(uwbled,btled,loraled,powerled);
+									  PCA9555_Set_One_Value_Output(IO_KONG,0);
+							      delay_us(10000);
+							      PCA9555_Set_One_Value_Output(IO_KONG,1);	
+										CloseUWB();
+										Uwbinit();
+										OpenUWB();
+										state_start_time = uwb_time_count;							
 							break;						
 						}
             break;
@@ -778,22 +789,72 @@
 				    switch(elapsed_time_jibu)
 						{
 							case UWB_OPEN_COUNT:
-											UWB_LED_OFF;
-							        LORA_LED_OFF;
-							        LoraReportPoll();
-											CloseUWB();	
+							    	CloseUWB();	                   							
+							      LoraReportPoll();
+							      LEDTask(0,0,0,2);
+
 							break;
 							
 							case UWB_MEASUREMENT_INTERVAL_SLEEP:
-								      PCA9555_Set_One_Value_Output(BT_IRQ ,0);
-											CloseUWB();
-							        Uwbinit();
-											OpenUWB();											
-                      state_start_time = uwb_time_count;							
+							      LEDTask(uwbled,btled,loraled,powerled);
+									  PCA9555_Set_One_Value_Output(IO_KONG,0);
+							      delay_us(10000);
+							      PCA9555_Set_One_Value_Output(IO_KONG,1);	
+										CloseUWB();
+										Uwbinit();
+										OpenUWB();											
+										state_start_time = uwb_time_count;	
+							
+							
 							break;						
 						}
             break;
 			}	
+
+}
+int LEDTask(uint8_t Uwb_led,uint8_t Bt_led,uint8_t Lora_led,uint8_t Power_led)
+{
+	if(Uwb_led==1)
+	{
+	 UWB_LED_ON;
+	}else
+	{
+	 UWB_LED_OFF;
+	}
+	
+	if(Bt_led==1)
+	{
+	 BT_LED_ON;
+	}else
+	{
+	 BT_LED_OFF;
+	}
+	if(Lora_led==1)
+	{
+	 LORA_LED_ON;
+	}else
+	{
+	 LORA_LED_OFF;
+	}
+	
+	if(powerled==1)
+	{
+	 GREEN_LED_ON;
+	 RED_LED_OFF;
+	}
+	else if(powerled==2)
+	{
+	 RED_LED_OFF;
+	 GREEN_LED_OFF;
+	}
+	else if(powerled==0)
+	{
+	 RED_LED_ON;
+	 GREEN_LED_OFF;
+	}
+	
+//	PCA9555_Set_One_Value_Output(BT_IRQ ,0); 
+
 
 }
 uint8_t io14_state;
@@ -844,13 +905,19 @@
 //		boot_deinit();
     while (1)
     { 
-			BT_LED_OFF;
+			if(jibu_flag)
+			{
+				jibu_flag=0;
+		  	step_count = mir3da_get_step(); // 获取步数
+			}
+		  
 //	    Lora_Tx_Poll();
-//			uwb_app_poll();
+			uwb_app_poll();
 			check_step_and_update_state();
-			
+//			upload_apppoll();
       IdleTask();
 			IMUTask();
+			
 //			if(1) 
 //       {
 ////					test1=gpio_pin_get_val(_4G_USART_RX_Pin);

--
Gitblit v1.9.3