From 0817c03a55b444ff4958723476f807486439e107 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 24 七月 2025 17:43:29 +0800
Subject: [PATCH] 4G升级待详细测试，基本功能开发完成
---
keil/include/main/main.c | 346 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 237 insertions(+), 109 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 79828a7..56e553a 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -24,6 +24,10 @@
#include "PCA9555.h"
#include "WS2812.h"
#include "DBG.h"
+#include "dw_app_anchor.h"
+#include "ymodem.h"
+#include "mk_phy.h"
+#include "HIDO_Debug.h"
//#define DEBUG_MODE
extern int simple_main(void);
@@ -74,11 +78,11 @@
extern uint8_t pca9555writedata_input[10];//暂存输入寄存器所有配置的数组
extern uint8_t pca9555writedata_polarity[10];//暂存输入极性反转寄存器所有配置的数组
uint8_t temp_pca9555writedata_input[10];//暂存上一次输入寄存器所有配置的数组
-typedef enum
-{ UN_BIND=0,
- LINK_SUCCESS,
- SEARCH_DEV,
-} Operation_step;
+//typedef enum
+//{ UN_BIND=0,
+// LINK_SUCCESS,
+// SEARCH_DEV,
+//} Operation_step;
Operation_step UWB_work_state;
@@ -401,6 +405,9 @@
uint8_t gps_ntripsend;
extern uint8_t uwb_OpenClose_flag;
+uint8_t Get_anchor_appdata_flag;
+uint8_t Get_anchor_appdata_num;
+
static void sleep_timer_callback(void *dev, uint32_t time)
{
// powerON_Task();
@@ -437,14 +444,14 @@
input5v_time=1;
if(taglist_num==0&&g_com_map[UWBFrequency]==1&&g_com_map[UWBENBLE]==1&&uwb_OpenClose_flag==1&¤t_state == STATE_NORMAL)
{
- CloseUWB();
- Uwb_init();
- OpenUWB();
+// CloseUWB();
+// Uwb_init();
+// OpenUWB();
}
- if(g_com_map[UWBENBLE]==1)
- {
- upload_apppoll();
- }
+// if(g_com_map[UWBENBLE]==1)
+// {
+// upload_apppoll();
+// }
} else {
flag_secondtask = 0;
}
@@ -525,7 +532,7 @@
void Program_Init(void)
{
uint32_t gpsbaudrate1;
- Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
+ Usart1ParseDataCallback = Usart1ParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
parameter_init_anchor();//g_com_map表初始化角色默认为基站
dev_id=g_com_map[DEV_ID];//这里不太对
// g_com_map[GROUP_ID]=9;
@@ -581,17 +588,17 @@
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag =1;//g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (2<<8)|12;
+ g_com_map[VERSION] = (1<<8)|0;
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,"固件版本:信标升级工卡 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]);
LOG_INFO(TRACE_MODULE_APP,"设备UWB状态: %x .\r\n",g_com_map[UWBENBLE]);
- LOG_INFO(TRACE_MODULE_APP,"设备GPS状态: %x .\r\n",g_com_map[GPSENBLE]);
+// LOG_INFO(TRACE_MODULE_APP,"设备GPS状态: %x .\r\n",g_com_map[GPSENBLE]);
LOG_INFO(TRACE_MODULE_APP,"设备UWB工作间隔: %x .\r\n",g_com_map[UWBFrequency]);
- LOG_INFO(TRACE_MODULE_APP,"设备GPS工作间隔: %x .\r\n",g_com_map[GPSFrequency]);
- LOG_INFO(TRACE_MODULE_APP,"当前GPS工作波特率: %d .\r\n",gpsbaudrate1);
+// LOG_INFO(TRACE_MODULE_APP,"设备GPS工作间隔: %x .\r\n",g_com_map[GPSFrequency]);
+// LOG_INFO(TRACE_MODULE_APP,"当前GPS工作波特率: %d .\r\n",gpsbaudrate1);
#ifdef _4G_115200
LOG_INFO(TRACE_MODULE_APP,"当前4G波特率: 115200.\r\n");
#else
@@ -674,8 +681,8 @@
} else {
powerled = RED;
}
- if(DBG_GetMode() == DBG_MODE_SHELL)
- {
+// if(DBG_GetMode() == DBG_MODE_SHELL)
+// {
if(ota_flag==1)
{
// OTA_Poll();
@@ -691,10 +698,10 @@
TCPClient_Poll();
Led_Task();
- if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {
- TCPClient_Poll_1();
- }
+// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+// {
+// TCPClient_Poll_1();
+// }
if(flag_secondtask)
{
flag_secondtask = 0;
@@ -703,7 +710,7 @@
led_offtask();
UserKeyTask();
- }
+// }
UART_CheckReceive();
if(flag_secondtask)
{
@@ -723,7 +730,7 @@
}
else
{
- Set4LEDColor(0,0,0,powerled);
+// Set4LEDColor(0,0,0,powerled);
}
if(input5v_time)
{
@@ -849,52 +856,52 @@
uint32_t elapsed_time_jibu;
extern uint8_t uwb_OpenClose_flag;
uint8_t uwb_close_count,uwb_close_count1;
-void upload_apppoll()
-{
+//void upload_apppoll()
+//{
- if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
- {
- if(g_com_map[UWBFrequency]>1)
- {
- elapsed_time_jibu = uwb_time_count - state_start_time;
- if(elapsed_time_jibu==1)
- {
- CloseUWB();
- UWBSendUDPTask();
- }
- else if(elapsed_time_jibu==g_com_map[UWBFrequency])
- {
- taglist_num = 0;
- CloseUWB();
- Uwb_init();
- OpenUWB();
- state_start_time = uwb_time_count;
- }
- }
- else
- {}
- }
- else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
- {
- elapsed_time_jibu = uwb_time_count - state_start_time;
- switch(elapsed_time_jibu)
- {
- case UWB_OPEN_COUNT:
- CloseUWB();
- UWBSendUDPTask();
-// uwb_close_count++;
- break;
+// if(current_state==STATE_NORMAL&&uwb_OpenClose_flag==1)
+// {
+// if(g_com_map[UWBFrequency]>1)
+// {
+// elapsed_time_jibu = uwb_time_count - state_start_time;
+// if(elapsed_time_jibu==1)
+// {
+// CloseUWB();
+//// UWBSendUDPTask();
+// }
+// else if(elapsed_time_jibu==g_com_map[UWBFrequency])
+// {
+// taglist_num = 0;
+// CloseUWB();
+// Uwb_init();
+// OpenUWB();
+// state_start_time = uwb_time_count;
+// }
+// }
+// else
+// {}
+// }
+// else if(current_state==STATE_SLEEP&&uwb_OpenClose_flag==1)
+// {
+// elapsed_time_jibu = uwb_time_count - state_start_time;
+// switch(elapsed_time_jibu)
+// {
+// case UWB_OPEN_COUNT:
+// CloseUWB();
+//// UWBSendUDPTask();
+//// uwb_close_count++;
+// break;
- case UWB_MEASUREMENT_INTERVAL_SLEEP:
- taglist_num = 0;
- CloseUWB();
- Uwb_init();
- OpenUWB();
- state_start_time = uwb_time_count;
-// uwb_close_count1++;
- break;
- }
- }
+// case UWB_MEASUREMENT_INTERVAL_SLEEP:
+// taglist_num = 0;
+// CloseUWB();
+// Uwb_init();
+// OpenUWB();
+// state_start_time = uwb_time_count;
+//// uwb_close_count1++;
+// break;
+// }
+// }
// switch (current_state)
// {
////#ifdef UWB_1_5HZ
@@ -939,15 +946,15 @@
// break;
// }
-}
+//}
-uint8_t flag_4guart_needinit=0;
-uint8_t index1,index2,index3;
-int16_t Voltage_input;
-int tt2;
-int test1,test3;
-uint32_t test4;
-extern uint8_t receive_flag;
+//uint8_t flag_4guart_needinit=0;
+//uint8_t index1,index2,index3;
+//int16_t Voltage_input;
+//int tt2;
+//int test1,test3;
+//uint32_t test4;
+//extern uint8_t receive_flag;
static void app_wdt_callback(void *dev, uint32_t status)
{
ASSERT(status, "WDT TIMEOUT，程序复位");
@@ -959,6 +966,115 @@
.int_en = true,
.callback = app_wdt_callback,
};
+
+
+
+uint8_t flag_4guart_needinit=0;
+uint8_t index1,index2,index3;
+int16_t Voltage_input;
+int tt2;
+int test1,test3;
+uint32_t test4;
+void Chuanshuwenjian_Poll()
+{
+ if(g_com_map[YAOGEIANC_UPWENJIAN_FLAG]==1)
+ {
+ calib_chip();
+ wdt_close(WDT_ID0);
+ Get_anchor_appdata_flag=1;
+ struct UART_CFG_T test_uart_cfg =
+ {
+ .parity = UART_PARITY_NONE,
+ .stop = UART_STOP_BITS_1,
+ .data = UART_DATA_BITS_8,
+ .flow = UART_FLOW_CONTROL_NONE,
+ .rx_level = UART_RXFIFO_CHAR_1,
+ .tx_level = UART_TXFIFO_EMPTY,
+ .baud = BAUD_115200,
+ .dma_en = true,
+ .int_rx = false,
+ .int_tx = false,
+
+ };
+ flash_open(FLASH_ID0, NULL);
+ //uart_open(UART_ID1, &test_uart_cfg);
+ uart_open(UART_ID1, &test_uart_cfg);
+ //uart_receive(UART_ID1, trx_buf, 1, uart_receive_callback);
+// LOG_INFO(TRACE_MODULE_APP,"MK8000-文件传输启动\r\n");
+// Get_anchor_appdata_flag=1;
+// HAL_TIM_Base_Start_IT(&htim4);
+ while(1)
+ {
+ if(SerialDownload()==0)
+ {
+// Get_anchor_appdata_flag=0;
+ g_com_map[YAOGEIANC_UPWENJIAN_FLAG]=0;
+ save_com_map_to_flash();
+ delay_ms(300);
+// Get_anchor_appdata_flag=0;
+ SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+ }
+// else{
+// SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
+// }
+ }
+ }
+}
+
+
+uint16_t final_bag_num;
+extern uint8_t Lora_qingqiu_flag;
+uint8_t send_lora_data[250];
+uint16_t mubiao_anchor_ID;
+uint16_t Lora_qingqiu_bao;
+uint8_t jindu;
+uint8_t shengji_changdu;
+uint8_t Dtu_shengji_jindu[20]= {0x55,0xAA,0x34,0x05};
+extern uint32_t tempflag;
+ uint32_t tx_en_start_u32;
+ uint32_t tx_en_start_u321;
+uint8_t baifenbi=5;
+void Lora_upanc_ing_Poll( void )
+{ uint16_t crc16;
+// if(Lora_upanc_flag==1)
+// {
+// Lora_deinit_Poll();
+ if(Lora_qingqiu_flag==1)
+ {
+ CloseUWB();
+// mubiao_anchor_ID=0x1872;
+ final_bag_num=(g_com_map[YAOGEIANC_UPWENJIAN_DAXIAO]/ONE_BAG_DAXIAO)+1;//计算一共要发都是包
+// final_bag_num=651;
+ Lora_qingqiu_flag=0;
+ send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATEFILE_RESP;//LORA MSG TYPE 定义
+ memcpy(&send_lora_data[SOURCE_ID_IDX],&dev_id,2);//自己ID 占用2个字节
+ memcpy(&send_lora_data[DEST_ID_IDX],&mubiao_anchor_ID,2);//标签或者基站的设备ID 2个字节
+ memcpy(&send_lora_data[MUQIAN_BAG],&Lora_qingqiu_bao,2);
+ memcpy(&send_lora_data[DATA_IDX], (HIDO_VOID *)(APP_CONFIG_APPLICATION_ADDRESS+Lora_qingqiu_bao*ONE_BAG_DAXIAO), ONE_BAG_DAXIAO);
+ crc16=Cal_CRC16(send_lora_data,DATA_IDX+ONE_BAG_DAXIAO);
+ memcpy(&send_lora_data[DATA_IDX+ONE_BAG_DAXIAO],&crc16,2);
+// Lora_status=1;
+ jindu=(Lora_qingqiu_bao*100)/final_bag_num;
+// LOG_INFO(TRACE_MODULE_APP, "升级进度%d\r\n",jindu);
+ Dtu_shengji_jindu[4]=jindu;
+ memcpy(&Dtu_shengji_jindu[5],&mubiao_anchor_ID,2);
+ if(jindu>baifenbi)
+ {
+ uart_send(UART_ID1, Dtu_shengji_jindu,9, NULL);
+ TCPClient_Upload_hex(Dtu_shengji_jindu,9);
+ baifenbi=baifenbi+10;
+ }
+ tx_en_start_u32 = phy_timer_count_get()+US_TO_PHY_TIMER_COUNT(100U);//发送必须要延时发送才可以用于测距否则立即发送会获取时间戳不对，需要计算程序运行时间，避免设置过去时间
+ tempflag=uwb_tx(send_lora_data,DATA_IDX+ONE_BAG_DAXIAO+2+2,1,tx_en_start_u32);//立即发送
+ tx_en_start_u321= phy_timer_count_get();
+// while(mac_is_busy());//等待发送完成
+
+ }
+// }
+}
+
+
+extern uint8_t shengji_flag;
int main(void)
{
__enable_irq();
@@ -973,7 +1089,7 @@
// delay_ms(100);
// gaodu=GetPressAndHeight();
PCA9555_init();
- board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_921600);
+ board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
// while(1);
// Reset reason
reset_cause_get();
@@ -996,7 +1112,7 @@
Uart_Register(UART_ID_4G, UART_ID0);
Uart_Register(UART_ID_DBG_GPS, UART_ID1);
DBG_Init();
- SendComMap(0x50,0);
+// SendComMap(0x50,0);
Internet_Init();
TCPClient_Init();
// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP)
@@ -1004,10 +1120,10 @@
// NTRIPClient_Init();
// NTRIPApp_Init();
// }
- if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {
- TCPClient_Init_1();
- }
+// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+// {
+// TCPClient_Init_1();
+// }
// HTTPClient_Init();
wdt_open(WDT_ID0,&app_wdt_cfg);//30s检测喂狗
LED_output_init();//配置彩色灯引脚
@@ -1019,53 +1135,66 @@
power_init();
Uwb_init();
- if(g_com_map[KEY_POWERON]==1)
- {
- WT588E_PLAY(0); //播报开机语音
- g_com_map[KEY_POWERON]=0;
- save_com_map_to_flash();
- }
- if(g_com_map[UWBFrequency]&&g_com_map[UWBENBLE])
- {
- OpenUWB();
- }
+// if(g_com_map[KEY_POWERON]==1)
+// {
+// WT588E_PLAY(0); //播报开机语音
+// g_com_map[KEY_POWERON]=0;
+// save_com_map_to_flash();
+// }
+// if(g_com_map[UWBFrequency]&&g_com_map[UWBENBLE])
+// {
+// OpenUWB();
+// }
if(!read_5v_input_pca())
{
Set4LEDColor(BLUE,GREEN,WHITE,RED);
- delay_ms(500);
+ delay_ms(200);
Set4LEDColor(RED,WHITE,RED,WHITE);
- delay_ms(500);
+ delay_ms(200);
Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
}
g_com_map[MODBUS_MODE] = 0;
state5v=0;
state5V_prase_flag=state5v;
+
+#ifdef UART_DEBUG_NORMALLY_OPEN
+ uart1_change_from_gps_to_debug();
+ PCA9555_Set_One_Value_Output(MCU_A,1);
+#else
gps_prase_flag=1;//恢复gps解析
uart1_change_from_debug_to_gps();//测试
- PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
- if(g_com_map[UWBENBLE]==0)
- {
- CloseUWB();
- }
+ PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
+#endif
+
+// if(g_com_map[UWBENBLE]==0)
+// {
+// CloseUWB();
+// }
sleep_timer_open(true, SLEEP_TIMER_MODE_RELOAD, sleep_timer_callback);
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
+ Chuanshuwenjian_Poll();
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
pca_input_detection_init(pca_handler);//pca检测输入
- GPS_Init();
+// GPS_Init();
// gaodu=GetPressAndHeight()*100;
+ OpenUWB();
while (1)
{
- uwb_app_poll();
+ if(!shengji_flag)
+ {
+ uwb_app_poll();
+ }
+
Internet_Poll();
HIDO_TimerPoll();
HIDO_ATLitePoll();
TCPClient_Poll();
wdt_ping(WDT_ID0);//喂狗
- if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
- {
- TCPClient_Poll_1();
- }
+// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
+// {
+// TCPClient_Poll_1();
+// }
if(flag_secondtask)
{
flag_secondtask = 0;
@@ -1073,8 +1202,7 @@
}
IMUTask();
IdleTask();
-// PCA9555_low_power_consumption();
- check_step_and_update_state();
+// check_step_and_update_state();
led_offtask();
}
}
--
Gitblit v1.9.3