From c0c1ff032edd95fb1c8becf9dab14d6652b8ea1f Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 30 五月 2025 16:22:20 +0800
Subject: [PATCH] 工装测试底板发货V1.0版本，增加默认g_com表组为150,按键按下后3s会重置标志位，避免重复启动免布线测功率模式
---
keil/include/main/main.c | 307 +++++++++++++++++++++++++-------------------------
1 files changed, 155 insertions(+), 152 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index d25232f..deb79d8 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -67,6 +67,7 @@
#define DEBUG_MODE
extern int simple_main(void);
extern int temp_main(void);
+void UserKeyState_change(void);
void uart_change_check(uint16_t gpio_state);
#define TEST_UART_POLL_MODE 0
#define TEST_UART_INTERUPT_MODE 1
@@ -79,7 +80,8 @@
#define WARING_LIMIT_TIME 10
#define UPDATE_TIME 10
-
+#define UWB_VOL_INVALID_LED_WAIT_COUNT 5
+#define UWB_VOL_VALID_LED_WAIT_COUNT 1
extern uint8_t mUsartReceivePack[100];
extern uint8_t mUsart2ReceivePack[150];
extern uint8_t state5V_prase_flag,gps_prase_flag;
@@ -113,7 +115,13 @@
} Operation_step;
Operation_step UWB_work_state;
-
+typedef enum
+{UWB_UNLINE=0,
+ VOLTAGE_NORMAL,
+ VOLTAGE_ABNORMAL,
+} UWB_State;
+extern UWB_State Voltage_State;
+Operation_step UWB_work_state;
Commend_SendDate send_struct;
struct ADC_CFG_T usr_adc_cfg = {
.mode = ADC_MODE_CONTINUE, /* Selected single conversion mode */
@@ -153,7 +161,7 @@
};
void uart_receive_callback(void *dev, uint32_t err_code)
{
- uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
+ uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
}
void mcu_deep_sleep(void)
{
@@ -169,6 +177,7 @@
sys_reset(0);
int_unlock(lock);
}
+uint8_t power_detect_flag;
static void adc_callback(void *data, uint32_t number)
{
uint32_t *result = (uint32_t *)data;
@@ -195,13 +204,16 @@
{
//power_low_flag=1;
//gps_air780_power_change(gps_power_state,0);//gps原样，关闭4G
- LOG_INFO(TRACE_MODULE_APP, "电池电压低于3.3V，4G，GPS停止工作\r\n");
+ power_detect_flag=1;
+ LOG_INFO(TRACE_MODULE_APP, "电池电压低于3.3V，异常工作\r\n");
}else{
//power_low_flag=0;
//gps_air780_power_change(gps_power_state,1);//gps原样,开启4G
- LOG_INFO(TRACE_MODULE_APP, "电池电压正常,4G，GPS,正常工作\r\n");
+ power_detect_flag=0;
+ LOG_INFO(TRACE_MODULE_APP, "电池电压正常,正常工作\r\n");
}
- PCA9555_Set_One_Value_Output(ADC_MINIUS,1);//拉高
+
+// PCA9555_Set_One_Value_Output(ADC_MINIUS,1);//拉高
// LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent);
}
extern uint8_t gps_uwb_flag,gps_need_data_flag;
@@ -211,7 +223,7 @@
uint32_t keystarttime,keystarttime2,keystarttime3;
extern uint32_t get_in_num,get_out_num;
uint8_t flag_4G_recdata;
-
+extern uint8_t taglist_num;
void IMUTask(void)
{
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1)
@@ -221,79 +233,89 @@
}
void UserKeyTask(void)
{
-if(!read_userkey_input_pca())
- {
- if(HIDO_TimerGetTick() - keystarttime3>2)
- {
- userkey_state = 1;
- keystarttime3 = HIDO_TimerGetTick();
- //UDPClient_UploadGPS();
- }
-// if(HIDO_TimerGetTick() - keystarttime2>10)
+//if(!read_userkey_input_pca())
+// {
+// if(HIDO_TimerGetTick() - keystarttime3>2)
// {
-//
-// g_com_map[CNT_RESTART] = 1;
+// userkey_state = 1;
+// keystarttime3 = HIDO_TimerGetTick();
+// //UDPClient_UploadGPS();
// }
- }else
- {
- keystarttime3 = HIDO_TimerGetTick();
- }
+//// if(HIDO_TimerGetTick() - keystarttime2>10)
+//// {
+////
+//// g_com_map[CNT_RESTART] = 1;
+//// }
+// }else
+// {
+// keystarttime3 = HIDO_TimerGetTick();
+// }
+ UserKeyState_change();
}
void PowerTask(void)
{
- if(read_powerkey_input_pca())
- {
- if(HIDO_TimerGetTick() - keystarttime>2)
- {
- keystarttime = HIDO_TimerGetTick();
- PCA9555_Set_One_Value_Output(PWR_ENABLE,0);//低电平关闭
- PCA9555_Set_One_Value_Output(GPS_LED,0);//输出低电平关闭LED
- }
-// if(HIDO_TimerGetTick() - keystarttime2>10)
+// if(read_powerkey_input_pca())
+// {
+// if(HIDO_TimerGetTick() - keystarttime>2)
// {
-//
-// g_com_map[CNT_RESTART] = 1;
+// keystarttime = HIDO_TimerGetTick();
+// PCA9555_Set_One_Value_Output(PWR_ENABLE,0);//低电平关闭
+// PCA9555_Set_One_Value_Output(GPS_LED,0);//输出低电平关闭LED
// }
- }else
- {
- keystarttime = HIDO_TimerGetTick();
- keystarttime2 = HIDO_TimerGetTick();
- }
+//// if(HIDO_TimerGetTick() - keystarttime2>10)
+//// {
+////
+//// g_com_map[CNT_RESTART] = 1;
+//// }
+// }else
+// {
+// keystarttime = HIDO_TimerGetTick();
+// keystarttime2 = HIDO_TimerGetTick();
+// }
}
void MinuteTask(void)
{
- PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
- adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
+ //adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
}
-void Air780eTask(void)
+void blink_test_led(enum IO_PIN_T pin_num)
{
-// if(!power_low_flag)//确认是否休眠下才开启功能
-// {
- if(flag_TCP_reconnectting||IfTCPConnected())
- {
-// // LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
-//
-//// if(flag_4guart_needinit)
-//// {
-//// flag_4guart_needinit = 0;
-//// AIR780EUartInit();
-//// }//yuan
- if(flag_4G_recdata==1)
- {
- flag_4G_recdata = 2;
-
- //LOG_INFO(TRACE_MODULE_APP, "运行Socket_RecvAll tt2 %d\r\n",tt2);
- Socket_RecvAll();
- }
- Internet_Poll();
- HIDO_ATLitePoll();
- HIDO_TimerPoll();
- TCPClient_Poll();
-
- }
-// }
-
+ gpio_pin_set(pin_num);//亮
+ delay_ms(500);
+ gpio_pin_clr(pin_num);//灭
}
+void blink_test_led_off(enum IO_PIN_T pin_num)
+{
+ gpio_pin_clr(pin_num);//灭
+}
+uint8_t wltag_uwb_timer;
+void voltage_Task(void)
+{
+ if(taglist_num==0)
+ {
+ Voltage_State=UWB_UNLINE;
+ }
+switch(Voltage_State){
+ case VOLTAGE_NORMAL:
+ if(wltag_uwb_timer++>=UWB_VOL_VALID_LED_WAIT_COUNT)
+ { wltag_uwb_timer=0;
+ blink_test_led(LED_PIN);
+ }
+ break;
+ case VOLTAGE_ABNORMAL:
+ if(wltag_uwb_timer++>=UWB_VOL_INVALID_LED_WAIT_COUNT)
+ { wltag_uwb_timer=0;
+ blink_test_led(LED_PIN);
+ }
+ case UWB_UNLINE:
+ blink_test_led_off(LED_PIN);
+ break;
+ }
+}
+void led_Task(void)
+{
+ voltage_Task();
+}
+uint8_t fang_dou_flag=0;
void SecondTask(void)
{static uint8_t second_count;
if(second_count++>60)
@@ -301,27 +323,7 @@
second_count = 0;
MinuteTask();
}
-// //UWB状态检测
-//if(!power_low_flag)//低供电下不需要检测重连
-// {
- if(IfTCPConnected())
- {
- TCP_reconnect_timer =0;
- flag_TCP_reconnectting = 0;
- } else {
- if(TCP_reconnect_timer<30)//如果TCP没有连接，每隔10分钟尝试连接30秒
- {
- flag_TCP_reconnectting = 1;
- } else {
- flag_TCP_reconnectting = 0;
- }
- if(TCP_reconnect_timer++>600)
- {
- TCP_reconnect_timer = 0;
- }
-
- }
-// }
+ led_Task();
HIDO_TimerTick();
if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
@@ -332,7 +334,17 @@
uint8_t tt=1;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
uint8_t uwb_enable_flag=0;
-
+uint32_t falling_time,rising_time,press_start_time,current_time;
+bool button_pressed;
+uint8_t change_buffer_flag=0;
+// 按键状态机
+typedef enum {
+ IDLE, // 空闲状态
+ WAIT_NEXT_RISING, // 已按下待确认
+ WAIT_NEXT_FALLING // 等待释放状态
+} ButtonState;
+volatile ButtonState sos_state = IDLE,temp_state;
+#define MAX_WAIT_TIME_S 3
void check_input_change(void)
{
uint16_t gpio_state;
@@ -360,15 +372,32 @@
delaysleep_count--;
//GPS工作逻辑
}
-
+void UserKeyState_change(void)
+{
+ if(change_buffer_flag)
+ {
+ current_time = HIDO_TimerGetTick();
+ if(current_time-falling_time>MAX_WAIT_TIME_S)
+ {//初始化状态
+ change_buffer_flag=0;
+ current_time=0;
+ falling_time=0;
+ }
+ }
+}
//static void move_handler(enum IO_PIN_T pin)
//{
// nomove_count=0;
//}
-static void pca_handler(enum IO_PIN_T pin)
+
+
+static void gpio_change_handler(enum IO_PIN_T pin)
{
- PCA9555_readdata(PCA9555_DEVICE_ADDR,pca9555writedata_input);//读输入寄存器的值
- check_input_change();
+ //change_buffer_flag=1;
+ falling_time = HIDO_TimerGetTick();
+ // 记录新的按下时间
+ sos_state=WAIT_NEXT_RISING;
+ change_buffer_flag = 1;
}
void _4gUsart_handler(enum IO_PIN_T pin)
@@ -419,7 +448,7 @@
port = g_com_map[TCP_PORT];
g_com_map[VERSION] = (1<<8)|0;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
- LOG_INFO(TRACE_MODULE_APP,"固件版本:4G-GPS定位手环 V%d.%d. \r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ LOG_INFO(TRACE_MODULE_APP,"固件版本: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);
}
@@ -450,28 +479,28 @@
}
void IdleTask(void)
{
-if(read_5v_input_pca())
- {
- if(state5v==0)
- {
- state5v=1;
- state5V_prase_flag=state5v;
- gps_prase_flag=0;//解除gps解析
- uart1_change_from_gps_to_debug();//测试
- PCA9555_Set_One_Value_Output(MCU_A,1);//输出高电平切换为5V输入
- }
- }else {
- if(state5v==1)
- {
- g_com_map[MODBUS_MODE] = 0;
- state5v=0;
- state5V_prase_flag=state5v;
- gps_prase_flag=1;//恢复gps解析
- uart1_change_from_debug_to_gps();//测试
- PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
- }
- }
- UART_CheckReceive();
+//if(read_5v_input_pca())
+// {
+// if(state5v==0)
+// {
+// state5v=1;
+// state5V_prase_flag=state5v;
+// gps_prase_flag=0;//解除gps解析
+// uart1_change_from_gps_to_debug();//测试
+//// PCA9555_Set_One_Value_Output(MCU_A,1);//输出高电平切换为5V输入
+// }
+// }else {
+// if(state5v==1)
+// {
+// g_com_map[MODBUS_MODE] = 0;
+// state5v=0;
+// state5V_prase_flag=state5v;
+// gps_prase_flag=1;//恢复gps解析
+// uart1_change_from_debug_to_gps();//测试
+//// PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
+// }
+// }
+ UART0_CheckReceive();
}
void boot_deinit(void)
{
@@ -497,7 +526,7 @@
board_clock_run();
boot_deinit();
board_pins_config();
- board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
+ board_debug_console_open_baud(TRACE_PORT_UART0,BAUD_115200);
// Reset reason
reset_cause_get();
reset_cause_clear();
@@ -526,61 +555,35 @@
// open system timer
//sys_timer_open();
// TODO 4G
- Uart_Register(UART_ID_4G, UART_ID0);
- Internet_Init();
- TCPClient_Init();
gpio_open();
- LED_output_init();//配置彩色灯引脚
- IIC2_Init();
- Accelerometer_Init();
- PCA9555_init();
-
-
- //AIR780E_Reset();
+ LED_output_init();//配置灯引脚和PA引脚
- adc_open(&usr_adc_cfg);
-
- if(!read_5v_input_pca())
- {
- Set4LEDColor(BLUE,GREEN,WHITE,GREEN);
- delay_ms(500);
- Set4LEDColor(RED,WHITE,RED,WHITE);
- delay_ms(500);
- //Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
- }
-// io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
-// gpio_pin_set_dir(SCL_PIN , GPIO_DIR_IN, 0);
-// io_pull_set(SCL_PIN , IO_PULL_UP, IO_PULL_UP_LEVEL4);
+// adc_open(&usr_adc_cfg);
Program_Init();
- //uart_open(UART_ID1, &test_uart_cfg);
- // uart1_change_from_gps_to_debug();
- //Uart1GpsRecDebugSend();
- uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
+ //uart_open(UART_ID1, &test_uart_cfg);
+ uart_receive(UART_ID0,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
// Initialize low power mode
power_init();
- //AIR780E_Reset(); //4G模块重启，耗时1.5秒,这个是无法同步的关键
sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
- //sleep_timer_start(__MS_TO_32K_CNT(g_com_map[COM_INTERVAL]));//测试
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
- PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
- adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
+// adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
//board_acceleration_detection_init(move_handler);
- pca_input_detection_init(pca_handler);//pca检测输入
+ gpio_change_detection_init(gpio_change_handler);//gpio中断检测输入切换对面免布线基站逻辑
//board_4GUsart_detection_init(_4gUsart_handler);
Uwb_init();
OpenUWB();
while (1)
{
uwb_app_poll();
- Air780eTask();
if(flag_secondtask)
{
flag_secondtask = 0;
SecondTask();
}
- PowerTask();
-// IMUTask();
+
+// PowerTask();
+//// IMUTask();
UserKeyTask();
IdleTask();
#ifndef DEBUG_MODE
--
Gitblit v1.9.3