From 2ee355706fb52cd610000dfa89ad244656428d72 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 14 八月 2025 18:23:46 +0800
Subject: [PATCH] 开发完成 先提交 适配纽扣电池
---
keil/include/main/main.c | 46 +++++-----------------------------------------
1 files changed, 5 insertions(+), 41 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 7c5518d..2c13333 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -342,7 +342,7 @@
uint8_t Get_anchor_appdata_flag;
uint8_t Get_anchor_appdata_num;
extern uint8_t update_tag_time;
-uint8_t sleep_limit_time=1;
+uint8_t sleep_limit_time=10;
uint8_t enable_sleep_count,sleep_flag;
static void sleep_timer_callback(void *dev, uint32_t time)
{
@@ -420,11 +420,11 @@
ip2 = (g_com_map[TCP_IP_2]>>12&0xf)*1000+(g_com_map[TCP_IP_2]>>8&0xf)*100+(g_com_map[TCP_IP_2]>>4&0xf)*10+(g_com_map[TCP_IP_2]&0xf);
ip3 = (g_com_map[TCP_IP_3]>>12&0xf)*1000+(g_com_map[TCP_IP_3]>>8&0xf)*100+(g_com_map[TCP_IP_3]>>4&0xf)*10+(g_com_map[TCP_IP_3]&0xf);
port = g_com_map[TCP_PORT];
- g_com_map[VERSION] = (1<<8)|1;
+ g_com_map[VERSION] = (1<<8)|4;
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,"服务器地址: %d.%d.%d.%d:%d.\r\n",ip0,ip1,ip2,ip3,port);
-}
+}
extern uint8_t motor_state;
extern float motor_keeptime;
uint8_t test1;
@@ -504,7 +504,7 @@
if(state5v==1)
{
state5v=0;
- sleep_limit_time=1;//新增插入串口后30s不休眠
+ sleep_limit_time=10;//新增插入串口后30s不休眠
enable_sleep_count=0;//重新插拔可以重置时间
}
@@ -605,43 +605,6 @@
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_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();
-// while(mac_is_busy());//等待发送完成
-
- }
-// }
-}
static void pwm_callback(void *dev, uint32_t status)
{
// uint8_t id = *(uint8_t *)dev;
@@ -729,6 +692,7 @@
IMUTask();
// UserKeyTask();
IdleTask();
+ LoraUp_Poll();
#ifndef DEBUG_MODE
if(sleep_flag&&state5v==0){//开始一段时间无休眠
--
Gitblit v1.9.3