From 44812eee65f5e9eb47c2b01b6cf86c101083eb61 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 25 七月 2025 17:41:24 +0800
Subject: [PATCH] 修改激活对应com表标志位位置，避免与其他元素耦合
---
keil/include/main/main.c | 114 ++++++++++++++++++++-------------------------------------
1 files changed, 40 insertions(+), 74 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 563373b..8c796c6 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -83,7 +83,7 @@
extern int distance;
extern uint8_t anchordata_num;
uint32_t dev_id;
-uint8_t group_id;
+uint16_t group_id;
uint16_t tag_frequency;
uint16_t disoffset;
uint16_t warning_distance,prewarning_distance;
@@ -145,7 +145,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)
{
@@ -187,11 +187,11 @@
{
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");
}
gpio_pin_set(ADC_GND_ENABLE);//在拉高
// LOG_INFO(TRACE_MODULE_APP, "The voltage is %%%d \r\n",bat_percent);
@@ -315,6 +315,8 @@
{ gpio_pin_clr(ADC_GND_ENABLE);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
}
+int16_t bind_count;
+extern uint16_t temp_group_id;
void SecondTask(void)
{static uint8_t second_count;
if(second_count++>60)
@@ -323,39 +325,19 @@
MinuteTask();
}
TagListUpdate_person_num_car();
- in_table_log();
-
-// 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)//低供电下不需要检测重连
-// {
-// 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;
-// }
-
-// }
-// }
+ if(g_com_map[BIND_START_INDEX])
+ {
+ if(bind_count--<=0)
+ {
+ g_com_map[BIND_START_INDEX]=0;
+ if(temp_group_id!=0)
+ {
+ g_com_map[GROUP_ID]=temp_group_id;
+ save_com_map_to_flash();
+ }
+ sys_reset(1);
+ }
+ }
HIDO_TimerTick();
if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
@@ -384,7 +366,7 @@
}
if(enbale_blink_flag)
{
- delay_us(5000);
+ //delay_us(5000);
green_charge_state=0;
charge_red_off();
}
@@ -411,6 +393,7 @@
extern uint16_t ip0,ip1,ip2,ip3,port;
extern uint8_t gps_4g_flag;
extern uint8_t gps_need_data_flag,gps_open_flag;
+extern float pd_offset,offset;
void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
@@ -419,6 +402,7 @@
group_id=g_com_map[GROUP_ID];//组ID
// tag_frequency = 1000/g_com_map[COM_INTERVAL];//测距频率这个存的是测距时间
memcpy(&disoffset,&g_com_map[DIST_OFFSET],2);
+ memcpy(&pd_offset,&g_com_map[PDOFFSET],4);
// g_com_map[ALARM_DISTANCE1] = 40;
// g_com_map[ALARM_DISTANCE2] = 40;
warning_distance=g_com_map[ALARM_DISTANCE1];
@@ -449,42 +433,22 @@
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)|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,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
+ LOG_INFO(TRACE_MODULE_APP,"设备ID: %x 组ID %d.\r\n",dev_id,group_id);
+ LOG_INFO(TRACE_MODULE_APP,"固件版本:跟随基站 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);
}
-
+uint8_t calibration_start;
void IdleTask(void)
{
-// if(gpio_pin_get_val(INPUT_5V_Pin))
-// {
-
-// if(state5v==0)
-// {
-// state5v=1;
-// state5V_prase_flag=state5v;
-// gps_prase_flag=0;//解除gps解析
-// uart1_change_from_gps_to_debug();//测试
-// // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
-// //UartInit();
-// }
-
-// //UART_CheckSend();
-// } 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();//测试
-// // uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);//开启dma
-// //UartDeinit();
-// }
-// }
- UART_CheckReceive();
+ UART0_CheckReceive();
+ if(g_com_map[CNT_CALIB])
+ {
+ g_com_map[CNT_CALIB]=0;
+ save_com_map_to_flash();
+ calibration_start=1;
+ }
}
int bind_check(void)
{
@@ -531,7 +495,7 @@
board_clock_run();
boot_deinit();
board_pins_config();
- board_debug_console_open(TRACE_PORT_UART1);
+ board_debug_console_open(TRACE_PORT_UART0);
// Reset reason
reset_cause_get();
reset_cause_clear();
@@ -566,6 +530,8 @@
// TCPClient_Init();
gpio_open();
+
+
board_output_init();//配置adcGND引脚
// battery_monitor_open();
// Voltage_input=battery_monitor_get();
@@ -576,7 +542,7 @@
Accelerometer_Init();
IO_control_init();
io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
- gpio_pin_set_dir(SCL_PIN , GPIO_DIR_IN, 0);
+ gpio_pin_set_dir(SCL_PIN , GPIO_DIR_OUT, 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引脚
@@ -587,13 +553,13 @@
// uart1_change_from_gps_to_debug();
//Uart1GpsRecDebugSend();
- 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);
// 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(g_com_map[COM_INTERVAL]));//测试
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
// board_5V_input_init(voltage_input_handler);
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
@@ -601,7 +567,7 @@
// LOG_INFO(TRACE_MODULE_APP, "测试进入app");
board_4GUsart_detection_init(_4gUsart_handler);
while (1)
- { test4=gpio_pin_get_val(SCL_PIN);
+ {
UWBPoll();
// if(!power_low_flag)//确认是否休眠下才开启功能
// {
--
Gitblit v1.9.3