From b84cfd7132f578a4d12764700ade6b15faf7c7e9 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 17 四月 2025 11:30:44 +0800
Subject: [PATCH] 加入ota
---
keil/include/main/main.c | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 0b15249..c4205db 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -254,6 +254,7 @@
{ gpio_pin_clr(ADC_GND_ENABLE);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
}
+uint8_t link_error_time;
void SecondTask(void)
{static uint8_t second_count;
if(second_count++>60)
@@ -278,6 +279,7 @@
{
if(IfTCPConnected())
{
+ link_error_time=0;
TCP_reconnect_timer =0;
flag_TCP_reconnectting = 0;
} else {
@@ -285,7 +287,8 @@
{
flag_TCP_reconnectting = 1;
} else {
- flag_TCP_reconnectting = 0;
+ //flag_TCP_reconnectting = 0;
+ sys_reset(4);//重连不上就复位
}
if(TCP_reconnect_timer++>600)
{
@@ -348,6 +351,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;
+uint8_t bat_bercent_hex;
void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
@@ -385,7 +389,7 @@
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
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)|7;
+ g_com_map[VERSION] = (1<<8)|15;
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);
@@ -463,6 +467,18 @@
int test1,test3;
uint32_t test4;
uint32_t time_count;
+
+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)
{
board_clock_run();
@@ -492,6 +508,7 @@
// Disable watchdog timer
wdt_close(WDT_ID0);
+ wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
LOG_INFO(TRACE_MODULE_APP, "UWB simple example\r\n");
// open system timer
@@ -539,12 +556,17 @@
board_4GUsart_detection_init(_4gUsart_handler);
while (1)
- { test4=gpio_pin_get_val(SCL_PIN);
-
+ {
+ test4=gpio_pin_get_val(SCL_PIN);
+ wdt_ping(WDT_ID0);//喂狗
if(!power_low_flag)//确认是否休眠下才开启功能
{
if(flag_TCP_reconnectting||IfTCPConnected())
{
+// if(flag_TCP_reconnectting)
+// {
+// link_error_time++;
+// }//后加的
// LOG_INFO(TRACE_MODULE_APP, "处理4G任务\r\n");
// if(flag_4guart_needinit)
--
Gitblit v1.9.3