From 345e9e9ae770e3ef884568a96a95e141236c5968 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期三, 25 十二月 2024 18:18:59 +0800
Subject: [PATCH] 目前成功的是基站端原代码rx写法帧间隔500，延时550，标签那边帧间隔500 基站default为600，成功低功耗帧间隔版本（标签常开）
---
keil/include/main/main.c | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index e2a3a44..48191b8 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -64,7 +64,7 @@
#include "PCA9555.h"
#include "WS2812.h"
-#define DEBUG_MODE
+//#define DEBUG_MODE
extern int simple_main(void);
extern int temp_main(void);
void uart_change_check(uint16_t gpio_state);
@@ -193,12 +193,12 @@
}
if(fVoltage_mv<3300)
{
- power_low_flag=1;
- gps_air780_power_change(gps_power_state,0);//gps原样，关闭4G
+ //power_low_flag=1;
+ //gps_air780_power_change(gps_power_state,0);//gps原样，关闭4G
//LOG_INFO(TRACE_MODULE_APP, "电池电压低于3.3V，4G，GPS停止工作\r\n");
}else{
- power_low_flag=0;
- gps_air780_power_change(gps_power_state,1);//gps原样,开启4G
+ //power_low_flag=0;
+ //gps_air780_power_change(gps_power_state,1);//gps原样,开启4G
//LOG_INFO(TRACE_MODULE_APP, "电池电压正常,4G，GPS,正常工作\r\n");
}
PCA9555_Set_One_Value_Output(ADC_MINIUS,1);//拉高
@@ -215,7 +215,7 @@
uint8_t TCP_reconnect_timer,flag_TCP_reconnectting = 1,flag_alam_state = 0,userkey_state;
uint8_t gps_enable_flag,motor_open_air_flag,moter_open_uwb_flag,flag_fenli_alarm = 0,fenli_alarm_count,delaysleep_count,enbale_blink_flag;
int need_open_gps_count;
-uint32_t keystarttime,keystarttime2;
+uint32_t keystarttime,keystarttime2,keystarttime3;
extern uint32_t get_in_num,get_out_num;
void MotorPoll(void)
{
@@ -301,15 +301,33 @@
}
void UserKeyTask(void)
{
+if(!read_userkey_input_pca())
+ {
+ if(HIDO_TimerGetTick() - keystarttime3>2)
+ {
+ userkey_state = 1;
+ keystarttime3 = HIDO_TimerGetTick();
+ //UDPClient_UploadGPS();
+ }
+// if(HIDO_TimerGetTick() - keystarttime2>10)
+// {
+//
+// g_com_map[CNT_RESTART] = 1;
+// }
+ }else
+ {
+ keystarttime3 = HIDO_TimerGetTick();
+ }
+}
+void PowerTask(void)
+{
if(read_powerkey_input_pca())
{
if(HIDO_TimerGetTick() - keystarttime>2)
{
- userkey_state = 1;
keystarttime = HIDO_TimerGetTick();
PCA9555_Set_One_Value_Output(PWR_ENABLE,0);//低电平关闭
PCA9555_Set_One_Value_Output(GPS_LED,0);//输出低电平关闭LED
- //UDPClient_UploadGPS();
}
// if(HIDO_TimerGetTick() - keystarttime2>10)
// {
@@ -321,7 +339,7 @@
keystarttime = HIDO_TimerGetTick();
keystarttime2 = HIDO_TimerGetTick();
}
-}
+}
void MinuteTask(void)
{
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
@@ -616,7 +634,6 @@
// io_pull_set(SCL_PIN , IO_PULL_UP, IO_PULL_UP_LEVEL4);
//gps_air780_power_change(0,1);//开启gps，4G
//加速度计初始化必须在IO_control_init之前因为复用SDA引脚
- gpio_pin_clr(ADC_GND_ENABLE);
Program_Init();
//uart_open(UART_ID1, &test_uart_cfg);
// uart1_change_from_gps_to_debug();
@@ -676,8 +693,9 @@
SecondTask();
}
- UserKeyTask();
+ PowerTask();
// IMUTask();
+ UserKeyTask();
IdleTask();
#ifndef DEBUG_MODE
//if(flag_sleeptimer)
--
Gitblit v1.9.3