From 4a0afa1557e0189d8d32cc59f7a246f5188bb8e6 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 25 三月 2025 09:39:16 +0800
Subject: [PATCH] 加入ota跟tts，tts目前780e固件不支持，ota还不行，没有log
---
keil/include/main/main.c | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 7ced589..67ca2ca 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -441,6 +441,7 @@
uint16_t chongman_time;
uint8_t bat_percent_old=100;
uint8_t input5vflag;
+extern uint8_t ota_flag;
void IdleTask(void)
{
if(read_5v_input_pca())
@@ -483,14 +484,27 @@
}
if(DBG_GetMode() == DBG_MODE_SHELL)
{
- if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {TCPClient_Poll_1();}
- //HIDO_InputPoll();
- DBG_Poll();
- Internet_Poll();
- HIDO_TimerPoll();
- HIDO_ATLitePoll();
- TCPClient_Poll();
+ if(ota_flag==1)
+ {
+ OTA_Poll();
+ HTTPClient_Poll();
+ }
+ else
+ {
+ uwb_app_poll();
+ }
+ Internet_Poll();
+ HIDO_TimerPoll();
+ HIDO_ATLitePoll();
+ TCPClient_Poll();
+ if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+ {TCPClient_Poll_1();}
+ if(flag_secondtask)
+ {
+ flag_secondtask = 0;
+ SecondTask();
+ }
+ UserKeyTask();
}
UART_CheckReceive();
if(flag_secondtask)
@@ -618,6 +632,7 @@
{
TCPClient_Init_1();
}
+ HTTPClient_Init();
gpio_open();
LED_output_init();//配置彩色灯引脚
IIC2_Init();
@@ -652,7 +667,15 @@
PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
while (1)
{
- uwb_app_poll();
+ if(ota_flag==1)
+ {
+ OTA_Poll();
+ HTTPClient_Poll();
+ }
+ else
+ {
+ uwb_app_poll();
+ }
Internet_Poll();
HIDO_TimerPoll();
HIDO_ATLitePoll();
--
Gitblit v1.9.3