From 2a1115b77100f6bfeca9031d9a9c82b07e130d32 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期五, 28 三月 2025 09:11:09 +0800
Subject: [PATCH] 功耗不对，基本逻辑实现
---
keil/include/main/main.c | 100 +++++++++++++++++++++++++++++++-------------------
1 files changed, 62 insertions(+), 38 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 94b17c8..44eaa7d 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -275,10 +275,16 @@
uint8_t flag_sleeptimer,flag_secondtask,secondtask_count,log_4g_enable_flag;
uint8_t uwb_enable_flag=0;
uint8_t input5v_time;
+uint8_t heart_upload_time=0;
extern uint8_t taglist_num;
-extern uint8_t ceshidata[500];
+//extern uint8_t ceshidata[500];
extern uint8_t ceshichangdu;
uint8_t gps_ntripsend;
+extern uint8_t in_the_room_flag;
+extern uint8_t lounei_flag;
+extern uint16_t g_spsum_GSV,g_snum_GSV;
+extern uint16_t g_spsum_GSV_sum;
+extern uint16_t g_snum_GSV_sum;
static void sleep_timer_callback(void *dev, uint32_t time)
{
if(secondtask_count++%2==0)
@@ -303,8 +309,33 @@
{
CloseUWB();
Uwb_init();
- OpenUWB();
+// OpenUWB();
}
+// in_the_room_flag=1;
+ if(in_the_room_flag==1)
+ {
+ Receive_g_spsum_Data(g_spsum_GSV);
+ Receive_g_snum_Data(g_snum_GSV);
+ if(g_spsum_GSV_sum<200&&g_snum_GSV_sum<9)
+ {
+ lounei_flag=1;
+ }
+ if(50<g_spsum_GSV_sum&&2<g_snum_GSV_sum)
+ {
+ lounei_flag=0;
+ }
+ Switch_low_power_mode(lounei_flag);
+
+ if(heart_upload_time==0||heart_upload_time==60)
+ {
+ TCPHeartBeatUpload();
+ heart_upload_time=0;
+ }
+ heart_upload_time++;
+ }
+
+
+
}else{
flag_secondtask = 0;
}
@@ -368,33 +399,33 @@
// g_com_map[IP_1]=198;
// g_com_map[IP_2]=60;
// g_com_map[IP_3]=6;
-// g_com_map[PORT]=6666;
+// g_com_map[PORT]=1102;
- g_com_map[IP_0]=117;
- g_com_map[IP_1]=72;
- g_com_map[IP_2]=111;
- g_com_map[IP_3]=237;
- g_com_map[PORT]=7000;
-
- g_com_map[TCP_IP_0]=111;
- g_com_map[TCP_IP_1]=198;
- g_com_map[TCP_IP_2]=60;
- g_com_map[TCP_IP_3]=6;
- g_com_map[TCP_PORT]=1234;
+// g_com_map[IP_0]=117;
+// g_com_map[IP_1]=72;
+// g_com_map[IP_2]=111;
+// g_com_map[IP_3]=237;
+// g_com_map[PORT]=7000;
+//
+// g_com_map[TCP_IP_0]=111;
+// g_com_map[TCP_IP_1]=198;
+// g_com_map[TCP_IP_2]=60;
+// g_com_map[TCP_IP_3]=6;
+// g_com_map[TCP_PORT]=1234;
/*
RTCMMODE_NONE,
RTCMMODE_TCP,
RTCMMODE_NTRIP,
*/
- g_com_map[RTCMMODE_INDEX] = RTCMMODE_NTRIP;
+// g_com_map[RTCMMODE_INDEX] = RTCMMODE_NTRIP;
- snprintf((char *)&g_com_map[NTRIP_HOST_INDEX], 32, "140.143.212.42");
- g_com_map[NTRIP_PORT_INDEX] = HIDO_UtilStrToInt("8005");
-// snprintf((char *)&g_com_map[NTRIP_PORT_INDEX], 32, "8005");
- snprintf((char *)&g_com_map[NTRIP_USERNANME_INDEX], 32, "test005");
- snprintf((char *)&g_com_map[NTRIP_PASSWORD_INDEX], 32, "Hxzk0228");
- snprintf((char *)&g_com_map[NTRIP_SOURCENAME_INDEX], 32, "RTCM32_GNSS2");
+// snprintf((char *)&g_com_map[NTRIP_HOST_INDEX], 32, "140.143.212.42");
+// g_com_map[NTRIP_PORT_INDEX] = HIDO_UtilStrToInt("8005");
+//// snprintf((char *)&g_com_map[NTRIP_PORT_INDEX], 32, "8005");
+// snprintf((char *)&g_com_map[NTRIP_USERNANME_INDEX], 32, "test005");
+// snprintf((char *)&g_com_map[NTRIP_PASSWORD_INDEX], 32, "Hxzk0228");
+// snprintf((char *)&g_com_map[NTRIP_SOURCENAME_INDEX], 32, "RTCM32_GNSS2");
if(g_com_map[BIND_DEV_ID]==0)
@@ -434,13 +465,13 @@
{
LOG_INFO(TRACE_MODULE_APP,"单点定位模式模式. \r\n");
}
+ delay_ms(500);
}
uint32_t adctick = 0;
uint8_t only_one_flag;
uint16_t chongman_time;
uint8_t bat_percent_old=100;
uint8_t input5vflag;
-uint8_t kai_4g_flag;
void IdleTask(void)
{
if(read_5v_input_pca())
@@ -483,12 +514,6 @@
}
if(DBG_GetMode() == DBG_MODE_SHELL)
{
- if(kai_4g_flag==0)
- {
- kai_4g_flag=1;
-// PCA9555_Set_One_Value_Output(AIR780E_ENBALE,1);
- //Shell_Init();
- }
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{TCPClient_Poll_1();}
//HIDO_InputPoll();
@@ -507,6 +532,12 @@
if(DBG_GetMode() == DBG_MODE_SHELL)
{
Set4LEDColor(uwbled,rtkled,led4g,powerled);
+ if(g_com_map[CNT_RESTART]==1)
+ {
+ g_com_map[CNT_RESTART]=0;
+ save_com_map_to_flash();
+ NVIC_SystemReset();
+ }
}
else
{
@@ -532,7 +563,7 @@
state5V_prase_flag=state5v;
gps_prase_flag=1;//恢复gps解析
uart1_change_from_debug_to_gps();//测试
- PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
+ PCA9555_Set_One_Value_Output(MCU_A,1);//输出低电平切换为GPS
}
}
UART_CheckReceive();
@@ -632,7 +663,7 @@
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
pca_input_detection_init(pca_handler);//pca检测输入
Uwb_init();
- OpenUWB();
+// OpenUWB();
// DBG_SetMode(DBG_MODE_SHELL);
// Shell_Init();
@@ -652,20 +683,13 @@
PCA9555_Set_One_Value_Output(MCU_A,0);//输出低电平切换为GPS
while (1)
{
- uwb_app_poll();
+ uwb_app_poll();
Internet_Poll();
HIDO_TimerPoll();
HIDO_ATLitePoll();
TCPClient_Poll();
if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_TCP)
{TCPClient_Poll_1();}
-// if(g_com_map[RTCMMODE_INDEX] == RTCMMODE_NTRIP&&gps_ntripsend==2)
-// {
-// gps_ntripsend=0;
-// NTRIPApp_ReportGGA(YUANGPS_ParseGGA_data, YUANGPS_ParseGGA_changdu);
-// memset(YUANGPS_ParseGGA_data,0,YUANGPS_ParseGGA_changdu);
-// YUANGPS_ParseGGA_changdu=0;
-// }
if(flag_secondtask)
{
flag_secondtask = 0;
--
Gitblit v1.9.3