From e41ccffbe9e4a9d59df51da01970e7ffc3848e95 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 06 五月 2025 16:53:46 +0800
Subject: [PATCH] 最新ota 加入ota语音
---
keil/include/main/main.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 1750eff..87525ec 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -417,7 +417,7 @@
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
- LOG_INFO(TRACE_MODULE_APP,"跳转OTA升级固件启动成功\r\n",g_com_map[VERSION]>>8,g_com_map[VERSION]&0xff);
+ LOG_INFO(TRACE_MODULE_APP,"OTA版本:加入OTA语音芯片,兼容OTA升级。跳转OTA升级固件启动成功\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]);
delay_ms(500);
}
@@ -581,6 +581,8 @@
extern uint8_t YUANGPS_ParseGGA_changdu;
static HIDO_CHAR url[256 + 1]/*="http://123.57.87.125:7001/hfs/MK8000-4G工卡V1.2.Bin"*/;
//static HIDO_CHAR url[256 + 1]="http://123.57.87.125:7001/hfs/MK4G工卡-V1.6.Bin";
+//static HIDO_CHAR url[256 + 1]="http://123.57.87.125:7001/hfs/r4.bin";
+//$download_audio,7342,http://39.106.210.13:280/hfs/russiavoice_20241213_1.bin
//void OTA_MODE(void)
//{
// if(g_com_map[OTA_FLAG])
@@ -664,6 +666,7 @@
IIC2_Init();
// Accelerometer_Init();
PCA9555_init();
+ WT588E02B_Init();
adc_open(&usr_adc_cfg);
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
power_init();
@@ -679,11 +682,14 @@
uart1_change_from_gps_to_debug();//测试
PCA9555_Set_One_Value_Output(MCU_A,1);//输出高电平切换为5V输入
- memcpy(/*(HIDO_UINT8 *)*/url,(void *)APP_CONFIG_IAP_PARAM_MAP,256);
- OTA_Start((HIDO_UINT8 *)url);
+ HIDO_UINT8 type = 0;
+// type=1;
+ memcpy(&type, (void *)APP_CONFIG_IAP_PARAM_MAP,1);
+ memcpy(/*(HIDO_UINT8 *)*/url,(void *)APP_CONFIG_IAP_PARAM_MAP+1,255);
+ OTA_Start(type, (HIDO_UINT8 *)url);
LOG_INFO(TRACE_MODULE_APP,"获取固件地址为:%s\r\n",url);
while (1)
- {
+ {
OTA_Poll();
HTTPClient_Poll();
Internet_Poll();
--
Gitblit v1.9.3