From f56dde7abad991a2c810708e80bf6da5f7a9fc88 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期五, 15 八月 2025 16:29:47 +0800
Subject: [PATCH] 适配最新ss定位标签固件
---
keil/include/main/main.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index b302328..2d09f2f 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -468,6 +468,7 @@
extern uint16_t ip0,ip1,ip2,ip3,port;
extern uint8_t gps_4g_flag;
extern uint8_t gps_need_data_flag,gps_open_flag;
+uint8_t uwb_ch;
void Program_Init(void)
{
Usart1ParseDataCallback = UsartParseDataHandler;//需改为默认为gps处理，UsartParseDataHandler为升级处理当调试时候改为
@@ -484,7 +485,7 @@
send_struct.alarmDistence=prewarning_distance;//更新报警距离
memcpy(&send_struct.gunLableId,&g_com_map[BIND_DEV_ID],2);//更新绑定ID
send_struct.tagId=dev_id;//更新设备ID
-
+// uwb_ch=g_com_map[NEARBASE_ID1];
// if(g_com_map[BIND_DEV_ID]==0)
// {
// UWB_work_state = UN_BIND;
@@ -656,6 +657,7 @@
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)
@@ -665,7 +667,7 @@
{
CloseUWB();
// mubiao_anchor_ID=0x1872;
- final_bag_num=(g_com_map[YAOGEIANC_UPWENJIAN_DAXIAO]/ONE_BAG_DAXIAO)+1;//计算一共要发都是包
+ final_bag_num=g_com_map[YAOGEIANC_UPWENJIAN_DAXIAO];//计算一共要发都是包
// final_bag_num=651;
Lora_qingqiu_flag=0;
send_lora_data[MSG_TYPE_IDX]=LORA_MSGTYPE_UPDATEFILE_RESP;//LORA MSG TYPE 定义
@@ -680,7 +682,11 @@
// 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_ID0, Dtu_shengji_jindu,9, NULL);
+ 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();
@@ -689,6 +695,7 @@
}
// }
}
+extern uint8_t shengji_flag;
int main(void)
{
board_clock_run();
@@ -740,9 +747,9 @@
adc_open(&usr_adc_cfg);
- IIC2_Init();
+// IIC2_Init();
Accelerometer_Init();
- PCA9555_init();
+// PCA9555_init();
if(!read_5v_input_pca())
{
Set4LEDColor(BLUE,GREEN,WHITE,GREEN);
@@ -782,6 +789,7 @@
//board_4GUsart_detection_init(_4gUsart_handler);
while (1)
{
+ if(!shengji_flag)
uwb_app_poll();
// Lora_upanc_ing_Poll();
//test4=gpio_pin_get_val(SCL_PIN);
--
Gitblit v1.9.3