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 | 209 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 162 insertions(+), 47 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 231750a..323c301 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -94,12 +94,16 @@
/****************************************************************引脚宏定义**************************************************/
-#define UWB_OPEN_COUNT 1
-#define UWB_MEASUREMENT_INTERVAL 3
-#define UWB_MEASUREMENT_INTERVAL_SLEEP 60
+#define UWB_OPEN_COUNT 1 // UWB每次开启持续时间（秒）
+#define UWB_MEASUREMENT_INTERVAL 3 // 正常状态测距周期
+#define UWB_MEASUREMENT_INTERVAL_SLEEP 60 // 休眠状态测距周期
+#define INACTIVE_TIMEOUT 30 // 无步数变化超时时间（秒）
+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];
extern uint8_t mUsart2ReceivePack[150];
extern uint8_t state5V_prase_flag,gps_prase_flag;
@@ -331,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;
@@ -338,33 +344,31 @@
HIDO_TimerTick();
// lora_tx_flag++;
uwb_time_count++;
- if(uwb_time_count>10000)
- {
- uwb_time_count=0;
- }
+ jibu_flag=1;
+ upload_apppoll();
+
if (current_state == STATE_NORMAL)
{
sleep_time++;
}
- step_count = mir3da_get_step(); // 获取步数
+
if(!read_5v_input_pca())
{
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;
@@ -390,28 +394,47 @@
}
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 = uwb_time_count;
+ state_start_time_jibu = uwb_time_count;
+ state_start_time=uwb_time_count;
}
- current_state = STATE_NORMAL;
- last_step_count = step_count;
+// if (current_state != STATE_NORMAL)
+// {
+// // 关闭可能正在运行的UWB
+// if (uwb_is_on) {
+// CloseUWB();
+// UWB_LED_OFF;
+// uwb_is_on = false;
+// }
+// current_state = STATE_NORMAL;
+// state_start_time = uwb_time_count; // 重置测距周期
+// }
+ current_state = STATE_NORMAL;
+ exercise_state=1;
+ last_step_count = step_count;
+
}
else
{
// 步数没有变化，检查是否需要切换到休眠状态
if (current_state == STATE_NORMAL)
- {
-// sleep_time = uwb_time_count - state_start_time;
- if (sleep_time >= 30)
+ {
+ uint32_t inactive_time = uwb_time_count - state_start_time_jibu;
+ if (inactive_time >= INACTIVE_TIMEOUT)
{ // 30秒后切换到休眠状态
-// current_state = STATE_SLEEP;
- sleep_time = 0;
+ current_state = STATE_SLEEP;
+ exercise_state=2;
+ state_start_time_jibu=uwb_time_count;
}
}
}
@@ -476,9 +499,9 @@
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
port = g_com_map[TCP_PORT];
- g_com_map[VERSION] = (1<<8)|11;
+ g_com_map[VERSION] = (1<<8)|12;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
- LOG_INFO(TRACE_MODULE_APP,"固件版本:BGK-mk+蓝牙V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ LOG_INFO(TRACE_MODULE_APP,"固件版本:BGK-mk+蓝牙薄工卡V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
LOG_INFO(TRACE_MODULE_APP,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
}
@@ -522,9 +545,15 @@
break;
}
}
- NVIC_SystemReset();
+ sys_reset(0);
+// NVIC_SystemReset();
// input5vflag=1;
}
+ else
+ {
+
+// sys_reset(0);
+ }
}
int bind_check(void)
@@ -590,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);
@@ -643,6 +672,7 @@
//串口1
io_pin_mux_set(UART1_RX, IO_FUNC4);
io_pin_mux_set(UART1_TX, IO_FUNC4);
+
board_debug_console_open(TRACE_PORT_UART1,BAUD_115200);
}
void spi_init()
@@ -722,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;
@@ -733,15 +765,21 @@
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
- UWB_LED_OFF;
- CloseUWB();
+ CloseUWB();
+ LoraReportPoll();
+ LEDTask(0,0,0,2);
+
break;
case UWB_MEASUREMENT_INTERVAL:
- UWB_LED_ON;
- OpenUWB();
- LoraReportPoll();
- 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;
@@ -751,19 +789,72 @@
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
- UWB_LED_OFF;
- CloseUWB();
+ CloseUWB();
+ LoraReportPoll();
+ LEDTask(0,0,0,2);
+
break;
case UWB_MEASUREMENT_INTERVAL_SLEEP:
- UWB_LED_ON;
- OpenUWB();
- LoraReportPoll();
- 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;
@@ -810,17 +901,41 @@
// io_pull_set(BOXING_PIN,IO_PULL_DOWN,IO_PULL_UP_LEVEL4);
//#endif
Uwbinit();
-// boot_deinit();
-
// OpenUWB();
+// 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();
+// upload_apppoll();
IdleTask();
IMUTask();
+
+// if(1)
+// {
+//// test1=gpio_pin_get_val(_4G_USART_RX_Pin);
+// uint32_t lock;
+// //flag_4guart_needinit = 1;
+//// Internet_Poll();
+//// HIDO_ATLitePoll();
+//// HIDO_TimerPoll();
+//// TCPClient_Poll();
+//
+// // delay_us(300000);
+// trace_flush();
+// lock = int_lock();
+// power_enter_power_down_mode(0);
+// uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart0_receive_callback);
+//// test3=gpio_pin_get_val(_4G_USART_RX_Pin);
+// //LOG_INFO(TRACE_MODULE_APP, "进入休眠\r\n");
+// int_unlock(lock);
+// }
}
}
--
Gitblit v1.9.3