From e7101a7064d3e6da5a946d64bb0e43a77377e2f0 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 22 五月 2025 18:11:43 +0800
Subject: [PATCH] 1.22，提交，待测试，给张博先修改
---
keil/include/main/main.c | 43 ++++++++++++++++++++++++++++++++-----------
1 files changed, 32 insertions(+), 11 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 8d33ab3..e1f2361 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -192,6 +192,7 @@
////// LOG_INFO(TRACE_MODULE_APP, "从休眠出来\r\n");
//// int_unlock(lock);
}
+uint8_t jiancebat_percent_flag;
static void adc_callback(void *data, uint32_t number)
{
uint32_t *result = (uint32_t *)data;
@@ -218,6 +219,7 @@
bat_percent=100;
if(bat_percent<0)
bat_percent=0;
+ jiancebat_percent_flag=1;
// if(fVoltage_mv<3300)
// {
// //power_low_flag=1;
@@ -531,8 +533,8 @@
// }
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|20;
-
+ g_com_map[VERSION] = (1<<8)|22;
+
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);
@@ -566,6 +568,8 @@
uint8_t bat_percent_old=100;
uint8_t input5vflag;
extern uint8_t ota_flag;
+uint8_t bat_percent_only_one=1;
+extern uint8_t jiancebat_percent_flag;
void IdleTask(void)
{
if(read_5v_input_pca())
@@ -588,6 +592,7 @@
while(1)
{
nomove_count = 0;
+ wdt_ping(WDT_ID0);//喂狗
// adctick = HIDO_TimerGetTick();
if(HIDO_TimerGetTick()-adctick>600) //10分钟采样一次 电量
{
@@ -703,12 +708,13 @@
powerled=0;
Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
}
- if(bat_percent<1)
+ if(bat_percent<1&&bat_percent_only_one&&jiancebat_percent_flag)
{
userkey_state=3;
heartbeasend_flag = 1;
guanjiflag=1;
guanjiflagtime=HIDO_TimerGetTick();
+ bat_percent_only_one=0;
}
if(guanjiflag)
{
@@ -843,7 +849,18 @@
int test1,test3;
uint32_t test4;
extern uint8_t receive_flag;
-float gaodu;
+uint16_t gaodu;
+static void app_wdt_callback(void *dev, uint32_t status)
+{
+ ASSERT(status, "WDT TIMEOUT，程序复位");
+ //LOG_INFO(TRACE_MODULE_APP, "程序卡死，看门狗复位");
+}
+ struct WDT_CFG_T app_wdt_cfg = {
+ .timeout = 32768 * 30,
+ .rst_en = true,
+ .int_en = true,
+ .callback = app_wdt_callback,
+ };
int main(void)
{
__enable_irq();
@@ -851,12 +868,15 @@
boot_deinit();
board_pins_config();
gpio_open();
- IIC2_Init();
- Accelerometer_Init();
- BarInit();
+ IIC2_Init();
+ Accelerometer_Init();
+// delay_ms(100);
+ BarInit();
+// delay_ms(100);
+// gaodu=GetPressAndHeight();
PCA9555_init();
- board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
-
+ board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
+// while(1);
// Reset reason
reset_cause_get();
reset_cause_clear();
@@ -892,7 +912,7 @@
TCPClient_Init_1();
}
// HTTPClient_Init();
-
+ wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
LED_output_init();//配置彩色灯引脚
@@ -928,7 +948,7 @@
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
pca_input_detection_init(pca_handler);//pca检测输入
- gaodu=GetPressAndHeight();
+ gaodu=GetPressAndHeight()*100;
while (1)
{
@@ -937,6 +957,7 @@
HIDO_TimerPoll();
HIDO_ATLitePoll();
TCPClient_Poll();
+ wdt_ping(WDT_ID0);//喂狗
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{
TCPClient_Poll_1();
--
Gitblit v1.9.3