From f39c69839382ee3890906e96211527dcb2eaeb51 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期六, 28 六月 2025 15:19:51 +0800
Subject: [PATCH] 修改语音上传bug，新增4G下发指令
---
keil/include/main/main.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 0b5a648..d16e8ad 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -275,6 +275,7 @@
}
}
+uint16_t gaodu;
uint8_t guanjiflag;
uint8_t heartbeasend_flag;
uint32_t guanjiflagtime;
@@ -366,6 +367,7 @@
HIDO_TimerTick();
// if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
+ gaodu=GetPressAndHeight()*100;
// else{
// nomove_count=g_com_map[NOMOVESLEEP_TIME]+1;
// }
@@ -376,6 +378,7 @@
uint8_t input5v_time;
extern uint8_t taglist_num;
uint8_t gps_ntripsend;
+extern uint8_t uwb_OpenClose_flag;
static void sleep_timer_callback(void *dev, uint32_t time)
{
// powerON_Task();
@@ -406,7 +409,7 @@
// uart_send(UART_ID1, ceshidata, 50,NULL);
}
input5v_time=1;
- if(taglist_num==0&&g_com_map[UWBFrequency]==1&&g_com_map[UWBENBLE]==1)
+ if(taglist_num==0&&g_com_map[UWBFrequency]==1&&g_com_map[UWBENBLE]==1&&uwb_OpenClose_flag==1)
{
CloseUWB();
Uwb_init();
@@ -586,7 +589,7 @@
// }
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|22;
+ g_com_map[VERSION] = (1<<8)|24;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -805,10 +808,11 @@
extern uint32_t uwb_time_count;
uint8_t GPS_UPLOAD_FLAG=0;
uint32_t elapsed_time_jibu;
+extern uint8_t uwb_OpenClose_flag;
void upload_apppoll()
{
- if(current_state==STATE_NORMAL)
+ if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
{
if(g_com_map[UWBFrequency]>1)
{
@@ -830,7 +834,7 @@
else
{}
}
- else if(current_state==STATE_SLEEP)
+ else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
{
elapsed_time_jibu = uwb_time_count - state_start_time;
switch(elapsed_time_jibu)
@@ -902,7 +906,6 @@
int test1,test3;
uint32_t test4;
extern uint8_t receive_flag;
-uint16_t gaodu;
static void app_wdt_callback(void *dev, uint32_t status)
{
ASSERT(status, "WDT TIMEOUT，程序复位");
@@ -968,7 +971,7 @@
wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
LED_output_init();//配置彩色灯引脚
-
+ PCA9555_Set_One_Value_Output(TTS_ENABLE,1);
WT588E02B_Init();
adc_open(&usr_adc_cfg);
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
--
Gitblit v1.9.3