From 5ff0b0f86d3f81e2d8aebd5ac5b55eb0d3d09961 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 28 七月 2025 14:05:58 +0800
Subject: [PATCH] 修改心跳包会上传工卡信标的升级固件名
---
keil/include/main/main.c | 116 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 65 insertions(+), 51 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 23f0408..c83576d 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -27,6 +27,7 @@
#include "dw_app_anchor.h"
#include "ymodem.h"
#include "mk_phy.h"
+#include "HIDO_Debug.h"
//#define DEBUG_MODE
extern int simple_main(void);
@@ -680,8 +681,8 @@
} else {
powerled = RED;
}
- if(DBG_GetMode() == DBG_MODE_SHELL)
- {
+// if(DBG_GetMode() == DBG_MODE_SHELL)
+// {
if(ota_flag==1)
{
// OTA_Poll();
@@ -709,7 +710,7 @@
led_offtask();
UserKeyTask();
- }
+// }
UART_CheckReceive();
if(flag_secondtask)
{
@@ -729,7 +730,7 @@
}
else
{
- Set4LEDColor(0,0,0,powerled);
+// Set4LEDColor(0,0,0,powerled);
}
if(input5v_time)
{
@@ -855,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
@@ -945,7 +946,7 @@
// break;
// }
-}
+//}
//uint8_t flag_4guart_needinit=0;
//uint8_t index1,index2,index3;
@@ -1019,7 +1020,18 @@
}
}
}
-
+char file_name[25]={0};
+uint8_t file_name_lenth;
+void get_download_file_name()
+{
+ uint16_t full_value = 0;
+// memcpy(file_name_lenth,&g_com_map[YAOGEIANC_UPWENJIAN_NAME_LENTH],1);
+ memcpy(&full_value, &g_com_map[YAOGEIANC_UPWENJIAN_NAME_LENTH], 2);
+ file_name_lenth = full_value & 0xFF; // 提取低字节
+ memcpy(file_name,&g_com_map[YAOGEIANC_UPWENJIAN_NAME],file_name_lenth);
+ LOG_INFO(TRACE_MODULE_APP,"文件名: %s .\r\n",file_name);
+ LOG_INFO(TRACE_MODULE_APP,"文件名长度: %d .\r\n",file_name_lenth);
+}
uint16_t final_bag_num;
extern uint8_t Lora_qingqiu_flag;
@@ -1060,6 +1072,7 @@
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);//发送必须要延时发送才可以用于测距否则立即发送会获取时间戳不对，需要计算程序运行时间，避免设置过去时间
@@ -1177,6 +1190,7 @@
// GPS_Init();
// gaodu=GetPressAndHeight()*100;
OpenUWB();
+ get_download_file_name();
while (1)
{
if(!shengji_flag)
@@ -1201,6 +1215,6 @@
IMUTask();
IdleTask();
// check_step_and_update_state();
-// led_offtask();
+ led_offtask();
}
}
--
Gitblit v1.9.3