From 928251d0f4e554e66ea2c7453fe06de6675ae16e Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 26 三月 2025 14:49:41 +0800
Subject: [PATCH] 去掉ota，单独搞ota文件
---
keil/include/main/main.c | 86 ++++++++++++++++++++++++++++++++++---------
1 files changed, 68 insertions(+), 18 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 67ca2ca..bfd50f2 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -416,7 +416,7 @@
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,"固件版本: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",g_com_map[IP_0],g_com_map[IP_1],g_com_map[IP_2],g_com_map[IP_3],g_com_map[PORT]);
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{
@@ -464,9 +464,10 @@
while(1)
{
nomove_count = 0;
- if(HIDO_TimerGetTick()-adctick>6000) //10分钟采样一次 电量
+// adctick = HIDO_TimerGetTick();
+ if(HIDO_TimerGetTick()-adctick>60) //10分钟采样一次 电量
{
- chongman_time=chongman_time+6;
+ chongman_time=chongman_time+60;
adctick = HIDO_TimerGetTick();
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
@@ -476,7 +477,7 @@
only_one_flag=1;
chongman_time=0;
}
- if(bat_percent>=99&&chongman_time>=1800)
+ if(bat_percent>=99&&chongman_time>=600)
{
powerled = GREEN;
}else{
@@ -486,8 +487,8 @@
{
if(ota_flag==1)
{
- OTA_Poll();
- HTTPClient_Poll();
+// OTA_Poll();
+// HTTPClient_Poll();
}
else
{
@@ -593,6 +594,53 @@
extern uint8_t receive_flag;
extern uint8_t YUANGPS_ParseGGA_data[256];
extern uint8_t YUANGPS_ParseGGA_changdu;
+static HIDO_CHAR url[256 + 1];
+//void OTA_MODE(void)
+//{
+// if(g_com_map[OTA_FLAG])
+// {
+// Uart_Register(UART_ID_4G, UART_ID0);
+// Uart_Register(UART_ID_DBG_GPS, UART_ID1);
+// DBG_Init();
+// DBG_SetMode(DBG_MODE_SHELL);
+// Internet_Init();
+// // TCPClient_Init();
+// HTTPClient_Init();
+// gpio_open();
+// LED_output_init();//配置彩色灯引脚
+// IIC2_Init();
+// // Accelerometer_Init();
+// PCA9555_init();
+// uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
+// power_init();
+// sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
+// sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
+// pca_input_detection_init(pca_handler);//pca检测输入
+// state5v=1;
+// state5V_prase_flag=state5v;
+// gps_prase_flag=0;//解除gps解析
+// uart1_change_from_gps_to_debug();//测试
+// PCA9555_Set_One_Value_Output(MCU_A,1);//输出高电平切换为5V输入
+// memcpy((HIDO_UINT8 *)url,g_com_map+OTA_URL_INDEX,g_com_map[OTA_URL_CHANGDU]);
+// OTA_Start((HIDO_UINT8 *)url);
+//
+//// g_com_map[OTA_FLAG]=0;
+//// save_com_map_to_flash();
+//// delay_us(100000);
+//// NVIC_SystemReset(); //软复位回到bootloader
+//
+//
+// while (1)
+// {
+// OTA_Poll();
+// HTTPClient_Poll();
+// Internet_Poll();
+// HIDO_TimerPoll();
+// HIDO_ATLitePoll();
+//// IdleTask();
+// }
+// }
+//}
int main(void)
{
board_clock_run();
@@ -616,11 +664,11 @@
}
calib_chip();
wdt_close(WDT_ID0);
+ Program_Init();
Uart_Register(UART_ID_4G, UART_ID0);
Uart_Register(UART_ID_DBG_GPS, UART_ID1);
DBG_Init();
- Program_Init();
Internet_Init();
TCPClient_Init();
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
@@ -632,7 +680,7 @@
{
TCPClient_Init_1();
}
- HTTPClient_Init();
+// HTTPClient_Init();
gpio_open();
LED_output_init();//配置彩色灯引脚
IIC2_Init();
@@ -659,29 +707,31 @@
delay_ms(500);
Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
}
- g_com_map[MODBUS_MODE] = 0;
- state5v=0;
- state5V_prase_flag=state5v;
- gps_prase_flag=1;//恢复gps解析
- uart1_change_from_debug_to_gps();//测试
- PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
+ g_com_map[MODBUS_MODE] = 0;
+ state5v=0;
+ state5V_prase_flag=state5v;
+ gps_prase_flag=1;//恢复gps解析
+ uart1_change_from_debug_to_gps();//测试
+ PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
while (1)
{
if(ota_flag==1)
{
- OTA_Poll();
- HTTPClient_Poll();
+// OTA_Poll();
+// HTTPClient_Poll();
}
else
{
- uwb_app_poll();
+ uwb_app_poll();
}
Internet_Poll();
HIDO_TimerPoll();
HIDO_ATLitePoll();
TCPClient_Poll();
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {TCPClient_Poll_1();}
+ {
+ TCPClient_Poll_1();
+ }
if(flag_secondtask)
{
flag_secondtask = 0;
--
Gitblit v1.9.3