From c653225a505eb47752ac707dc47f1b15385c81d8 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 17 一月 2025 18:05:14 +0800
Subject: [PATCH] 加入标签电量的存储逻辑，和更新的逻辑，精简了代码函数封装
---
keil/include/main/main.c | 212 +++++++++++-----------------------------------------
1 files changed, 45 insertions(+), 167 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index d19347f..d25232f 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -195,103 +195,23 @@
{
//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");
+ LOG_INFO(TRACE_MODULE_APP, "电池电压低于3.3V，4G，GPS停止工作\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");
+ LOG_INFO(TRACE_MODULE_APP, "电池电压正常,4G，GPS,正常工作\r\n");
}
PCA9555_Set_One_Value_Output(ADC_MINIUS,1);//拉高
// LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent);
}
-//void UartInit(void)
-//{
-//board_pins_config();
-//uart_open(UART_ID1, &test_uart_cfg);
-//board_debug_console_open(TRACE_PORT_UART0);
-//uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
-//}
extern uint8_t gps_uwb_flag,gps_need_data_flag;
uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0,userkey_state;
uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count,enbale_blink_flag;
int need_open_gps_count;
uint32_t keystarttime,keystarttime2,keystarttime3;
extern uint32_t get_in_num,get_out_num;
-void MotorPoll(void)
-{
- if(UWB_work_state==UN_BIND) {
- gps_uwb_flag=0;//关闭GPS
- moter_open_uwb_flag=0;//关闭震动
- need_open_gps_count=0;//清0计数gps
- } else { //绑定状态下
- if(anchordata_num==1) {
- if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离
- fenli_alarm_count = 0;
- if(flag_fenli_alarm)
- {
- flag_fenli_alarm = 0;
- fenli_alarm_count = 0;
- _4GAlarmUpload(2);
- }
- }
- }
- if(distance>g_com_map[ALARM_DISTANCE1]||anchordata_num==0)
- {
- if(fenli_alarm_count++>20)
- {
- if(!flag_fenli_alarm)
- {
- flag_fenli_alarm = 1;
- _4GAlarmUpload(1);
- }
- }
- }
- if(distance<g_com_map[ALARM_DISTANCE1]) { //小于预警距离
- if(flag_alam_state)
- {
- flag_alam_state = 0;
+uint8_t flag_4G_recdata;
- }
-
- need_open_gps_count=0;
- moter_open_uwb_flag=0;//关闭震动
- gps_uwb_flag=0;//关闭GPS
- } else if(g_com_map[ALARM_DISTANCE1]<=distance&&distance<=g_com_map[ALARM_DISTANCE2]) { //大于预警距离小于报警距离
- need_open_gps_count++;
- moter_open_uwb_flag=1;//开启震动
- if(need_open_gps_count>=20) {
- if(!flag_alam_state)
- {
- flag_alam_state = 1;
- }
- gps_uwb_flag=1;//开启gps测距流程
- need_open_gps_count=0;
- }
- } else if(distance>=g_com_map[ALARM_DISTANCE2]) { //大于报警距离
- need_open_gps_count++;
- moter_open_uwb_flag=1;//开启震动
- if(need_open_gps_count>=20) {
- if(!flag_alam_state)
- {
- flag_alam_state = 1;
- }
- gps_uwb_flag=1;//开启gps测距流程
- need_open_gps_count=0;
- }
-
- }
- if(anchordata_num==0) {
- if(!flag_alam_state)
- {
- flag_alam_state = 1;
- }
- distance = 0x1ffff;
- gps_uwb_flag=1;//开启gps测距流程
- moter_open_uwb_flag=1;//开启震动
- need_open_gps_count=0;
- }
- }
- }
void IMUTask(void)
{
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1)
@@ -345,6 +265,35 @@
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
}
+void Air780eTask(void)
+{
+// 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();
+
+ }
+// }
+
+}
void SecondTask(void)
{static uint8_t second_count;
if(second_count++>60)
@@ -352,17 +301,6 @@
second_count = 0;
MinuteTask();
}
- //UWBOneSecondTask();
-// if(!power_low_flag)
-// Gps_change();
-// else{
-// gps_power_state=0;//关闭GPS
-// update_led_power_state();
-// //初始化GPS计数数据
-// gps_need_data_flag=1;
-// gps_wait_count2=0;
-// gps_wait_count=0;
-// }
// //UWB状态检测
//if(!power_low_flag)//低供电下不需要检测重连
// {
@@ -394,7 +332,7 @@
uint8_t tt=1;
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
uint8_t uwb_enable_flag=0;
-uint8_t flag_4G_recdata;
+
void check_input_change(void)
{
uint16_t gpio_state;
@@ -423,10 +361,10 @@
//GPS工作逻辑
}
-static void move_handler(enum IO_PIN_T pin)
-{
- nomove_count=0;
-}
+//static void move_handler(enum IO_PIN_T pin)
+//{
+// nomove_count=0;
+//}
static void pca_handler(enum IO_PIN_T pin)
{
PCA9555_readdata(PCA9555_DEVICE_ADDR,pca9555writedata_input);//读输入寄存器的值
@@ -535,27 +473,6 @@
}
UART_CheckReceive();
}
-int bind_check(void)
-{
- if(g_com_map[BIND_DEV_ID]!=0x00)
- {
- return 1;
-//绑定信息为1说明设备已经被下发绑定
- } else {
- return 0;
-//绑定信息为0说明设备未被绑定
- }
-}
-void check_if_in_search(void)
-{
- if(link_success_flag==1) { //如果第一次测距收包成功那么则进入连接测距模式
- UWB_work_state=LINK_SUCCESS;
- } else { //否则进入搜索模式
- UWB_work_state=SEARCH_DEV;
- if(first_search_flag==0)
- first_search_flag=1;
- }
-}
void boot_deinit(void)
{
//将boot中串口返回普通gpio
@@ -580,7 +497,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_UART1,BAUD_115200);
// Reset reason
reset_cause_get();
reset_cause_clear();
@@ -613,21 +530,15 @@
Internet_Init();
TCPClient_Init();
gpio_open();
- LED_output_init();//配置adcGND引脚
+ LED_output_init();//配置彩色灯引脚
IIC2_Init();
Accelerometer_Init();
PCA9555_init();
- AIR780E_Reset();
-// battery_monitor_open();
-// Voltage_input=battery_monitor_get();
-// battery_monitor_close();
+ //AIR780E_Reset();
adc_open(&usr_adc_cfg);
-
-
-
if(!read_5v_input_pca())
{
@@ -637,69 +548,36 @@
delay_ms(500);
//Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
}
- //IO_control_init();
// 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);
- //gps_air780_power_change(0,1);//开启gps，4G
-//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
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);
-// Initialize low power mode
+ // 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));//测试
- // board_5V_input_init(voltage_input_handler);
- PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
+ PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
- board_acceleration_detection_init(move_handler);
+ //board_acceleration_detection_init(move_handler);
pca_input_detection_init(pca_handler);//pca检测输入
-
//board_4GUsart_detection_init(_4gUsart_handler);
Uwb_init();
OpenUWB();
-
-
while (1)
{
- uwb_app_poll();
-
-// 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();
-
- }
-// }
+ uwb_app_poll();
+ Air780eTask();
if(flag_secondtask)
{
flag_secondtask = 0;
SecondTask();
-
}
PowerTask();
// IMUTask();
--
Gitblit v1.9.3