From 08b03003355d51abd21fdf97dd4a4f0225092dc6 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期三, 16 十月 2024 15:57:03 +0800
Subject: [PATCH] 上传测试1s一次
---
APL/APL.c | 182 ++++++++++++++++++++++----------------------
1 files changed, 91 insertions(+), 91 deletions(-)
diff --git a/APL/APL.c b/APL/APL.c
index 0390e26..17394fc 100644
--- a/APL/APL.c
+++ b/APL/APL.c
@@ -220,9 +220,9 @@
void Lora_Sendfinalbag_Poll()
{
// Lora_SendData((HIDO_UINT8 *)GPS_final_data,GPS_final_changdu);
-if(lp_time-lora_sendfinalbag_time>10&&lora_sendfinalbag_flag)
+if(lp_time-lora_sendfinalbag_time>1)
{
- lora_sendfinal_rx_bag_flag=1;
+// lora_sendfinal_rx_bag_flag=1;
Lora_SendData((HIDO_UINT8 *)GPS_final_data,GPS_final_changdu); //发送数据
memset(&lora_rxbuf,0,sizeof(lora_rxbuf));//发一次清一次rx的缓存
lora_rxbufnum=0;
@@ -233,13 +233,13 @@
HAL_Delay(100);
loraled=LEDOFF;
Set4LEDColor(powerled,loraled,gpsled,uwbled);
- if(lora_sendfinalbag_num>4)
- {
- lora_sendfinal_rx_bag_flag=0;
- lora_sendfinalbag_flag=0;
- lora_sendfinalbag_num=0;
- }
- HIDO_Debug("lora bufa\r\n");
+// if(lora_sendfinalbag_num>4)
+// {
+// lora_sendfinal_rx_bag_flag=0;
+// lora_sendfinalbag_flag=0;
+// lora_sendfinalbag_num=0;
+// }
+// HIDO_Debug("lora bufa\r\n");
}
}
@@ -363,90 +363,90 @@
if(Lora_IsIdle() == HIDO_TRUE)
Input_5V_Poll();
#if 1
- if(((Lora_IsIdle() == HIDO_TRUE)/*为了防止lora初始化的时候进入休眠*/
- && (GPS_IsIdle() == HIDO_TRUE)/*防止gps工作时进入休眠*/
- &&(lora_sendfinal_rx_bag_flag==0)//防止lora在2s等待接收的时候进入休眠
- && (IsTypecCActive() == HIDO_FALSE)/*5v输入检测时不休眠*/&&(fangchai_flag==0)&&fengming_flag==0) ||nomove_flag==1/*静止1小时立刻休眠。*/)
- {
-////// if(Lora_IsIdle() == HIDO_TRUE)
- Power_Sleep();
-//HIDO_Debug("in sleep\r\n");
- }
- else
- {
- }
-if(nomove_flag==0&&(Lora_IsIdle() == HIDO_TRUE)&&Input_5V_flag==0)
-{
- if(GPS_ON_flag)
- {
- /* 检查GPS定时 */
- switch(l_eGPSState)
- {
- case GPS_OFF:
- {
- if(lp_time-GPSDateTime > g_com_map[GPS_ONTIME] /*|| IsVibration() == HIDO_TRUE*/||uwbqiehuangps_flag==1)
- {
- uwbqiehuangps_flag=0;
- l_bIsVibration = HIDO_FALSE;
- HIDO_Debug("GPS ON\r\n");
- Power_GPS_LoraOn();
- l_eGPSState = GPS_ON;
- GPSDateTime=lp_time;
- if(IsTypecCActive() == HIDO_FALSE)//如果有5v输入的话不关灯。
- {
- powerled=LEDOFF;
- Set4LEDColor(powerled,loraled,gpsled,uwbled); //关一下电源灯，防止gps突然工作不进入休眠，电源灯常量
- }
-
- }
+// if(((Lora_IsIdle() == HIDO_TRUE)/*为了防止lora初始化的时候进入休眠*/
+// && (GPS_IsIdle() == HIDO_TRUE)/*防止gps工作时进入休眠*/
+// &&(lora_sendfinal_rx_bag_flag==0)//防止lora在2s等待接收的时候进入休眠
+// && (IsTypecCActive() == HIDO_FALSE)/*5v输入检测时不休眠*/&&(fangchai_flag==0)&&fengming_flag==0) ||nomove_flag==1/*静止1小时立刻休眠。*/)
+// {
+//////// if(Lora_IsIdle() == HIDO_TRUE)
+// Power_Sleep();
+////HIDO_Debug("in sleep\r\n");
+// }
+// else
+// {
+// }
+//if(nomove_flag==0&&(Lora_IsIdle() == HIDO_TRUE)&&Input_5V_flag==0)
+//{
+// if(GPS_ON_flag)
+// {
+// /* 检查GPS定时 */
+// switch(l_eGPSState)
+// {
+// case GPS_OFF:
+// {
+// if(lp_time-GPSDateTime > g_com_map[GPS_ONTIME] /*|| IsVibration() == HIDO_TRUE*/||uwbqiehuangps_flag==1)
+// {
+// uwbqiehuangps_flag=0;
+// l_bIsVibration = HIDO_FALSE;
+// HIDO_Debug("GPS ON\r\n");
+// Power_GPS_LoraOn();
+// l_eGPSState = GPS_ON;
+// GPSDateTime=lp_time;
+// if(IsTypecCActive() == HIDO_FALSE)//如果有5v输入的话不关灯。
+// {
+// powerled=LEDOFF;
+// Set4LEDColor(powerled,loraled,gpsled,uwbled); //关一下电源灯，防止gps突然工作不进入休眠，电源灯常量
+// }
+//
+// }
- break;
- }
- case GPS_ON:
- {
- if(lp_time-GPSDateTime > 60)
- {
- lora_sendfinalbag_flag=1;
- lora_sendfinal_rx_bag_flag=1;
- HIDO_Debug("GPS OFF\r\n");
- Power_GPS_LoraOff();
- l_eGPSState = GPS_OFF;
- GPSDateTime=lp_time;
- }
+// break;
+// }
+// case GPS_ON:
+// {
+// if(lp_time-GPSDateTime > 60)
+// {
+// lora_sendfinalbag_flag=1;
+// lora_sendfinal_rx_bag_flag=1;
+// HIDO_Debug("GPS OFF\r\n");
+// Power_GPS_LoraOff();
+// l_eGPSState = GPS_OFF;
+// GPSDateTime=lp_time;
+// }
- break;
- }
- case GPS_SUCCESS:
- {
- lora_sendfinalbag_flag=1;
- lora_sendfinal_rx_bag_flag=1;
- HIDO_Debug("GPS SUCCESS\r\n");
- Power_GPS_LoraOff();
- l_eGPSState = GPS_OFF;
- GPSDateTime=lp_time;
- break;
- }
- default:
- {
- break;
- }
- }
- }
- else
- {
- Power_GPS_LoraOff();
- l_eGPSState = GPS_OFF;
-// uwbqiehuangps_flag=1;//如果放开，就是uwb切到gps会立刻工作一次，不放开就是就算uwb切换到gps也要判断是否过了一小时
- }
- if(fengming_flag==1)
- {Beep_On();}
-}
-else
-{
- Power_GPS_LoraOff();
- l_eGPSState = GPS_OFF;
- uwbqiehuangps_flag=1;
-}
+// break;
+// }
+// case GPS_SUCCESS:
+// {
+// lora_sendfinalbag_flag=1;
+// lora_sendfinal_rx_bag_flag=1;
+// HIDO_Debug("GPS SUCCESS\r\n");
+// Power_GPS_LoraOff();
+// l_eGPSState = GPS_OFF;
+// GPSDateTime=lp_time;
+// break;
+// }
+// default:
+// {
+// break;
+// }
+// }
+// }
+// else
+// {
+// Power_GPS_LoraOff();
+// l_eGPSState = GPS_OFF;
+//// uwbqiehuangps_flag=1;//如果放开，就是uwb切到gps会立刻工作一次，不放开就是就算uwb切换到gps也要判断是否过了一小时
+// }
+// if(fengming_flag==1)
+// {Beep_On();}
+//}
+//else
+//{
+// Power_GPS_LoraOff();
+// l_eGPSState = GPS_OFF;
+// uwbqiehuangps_flag=1;
+//}
#ifndef UWB_OFF_FANGCHAI_ON
#else
/* 拆卸告警 */
--
Gitblit v1.9.3