From 8217c70984ac4feb7bfc952e4f6e944bf824527d Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 06 五月 2025 16:51:53 +0800
Subject: [PATCH] Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBProject into MK大工卡-低精度GPS-1/5HZ
---
keil/include/main/main.c | 88 +++++++++++++++++++++++++++++--------------
1 files changed, 59 insertions(+), 29 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 476ccbe..3f692d9 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -28,6 +28,8 @@
//#define DEBUG_MODE
extern int simple_main(void);
extern int temp_main(void);
+void boot_deinit(void);
+void upload_apppoll();
#define TEST_UART_POLL_MODE 0
#define TEST_UART_INTERUPT_MODE 1
#define TEST_UART_DMA_MODE 2
@@ -41,7 +43,7 @@
#define UWB_OPEN_COUNT 1
-#define UWB_MEASUREMENT_INTERVAL 3
+#define UWB_MEASUREMENT_INTERVAL 5
#define UWB_MEASUREMENT_INTERVAL_SLEEP 60
extern uint8_t mUsartReceivePack[100];
@@ -112,7 +114,7 @@
.flow = UART_FLOW_CONTROL_NONE,
.rx_level = UART_RXFIFO_CHAR_1,
.tx_level = UART_TXFIFO_EMPTY,
- .baud = BAUD_115200,
+ .baud = BAUD_9600,
#if (TEST_UART_MODE == TEST_UART_POLL_MODE)
.dma_en = false,
.int_rx = false,
@@ -131,22 +133,31 @@
{
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
}
+uint8_t deep_sleep_falg=1;
void mcu_deep_sleep(void)
{
- uint32_t lock;
- trace_flush();
- lock = int_lock();
-// LOG_INFO(TRACE_MODULE_APP, "进入深度休眠\r\n");
+// uint32_t lock;
+// trace_flush();
+// lock = int_lock();
+//// LOG_INFO(TRACE_MODULE_APP, "进入深度休眠\r\n");
// gps_air780_power_change(0,0);//关闭gps，4G
+ deep_sleep_falg=0;
PCA9555_Set_One_Value_Output(LED_POWER,0);//输出低电平关闭LED
PCA9555_Set_One_Value_Output(GPS_POWER,0);//关闭gps，4G
+ PCA9555_Set_One_Value_Config(MAIN_RI,0);//配置4G唤醒引脚为输入
+// PCA9555_Set_One_Value_Output(MAIN_RI,1);
+ boot_deinit();
+ CloseUWB();
PCA9555_Set_One_Value_Output(AIR780E_ENBALE,0);//关闭gps，4G
- sleep_timer_stop();
- //adc_close();
- power_enter_power_down_mode(1);
-// LOG_INFO(TRACE_MODULE_APP, "从休眠出来\r\n");
- sys_reset(0);
- int_unlock(lock);
+
+// sleep_timer_stop();
+// //adc_close();
+// power_enter_power_down_mode(1);
+// delay_us(200000);
+
+// sys_reset(0);
+//// LOG_INFO(TRACE_MODULE_APP, "从休眠出来\r\n");
+// int_unlock(lock);
}
static void adc_callback(void *data, uint32_t number)
{
@@ -161,7 +172,7 @@
{
bat_percent = 0;
}
- else if(fVoltage_mv > 4100)
+ else if(fVoltage_mv > 4200)
{
bat_percent = 100;
}
@@ -196,6 +207,7 @@
{
if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&g_com_map[IMU_ENABLE]==1)
{//power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)ACCLERATE_DETECT_Pin, POWER_WAKEUP_LEVEL_HIGH);
+ power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)PCA_INPUT_DETECT, POWER_WAKEUP_LEVEL_LOW);
mcu_deep_sleep();
}
}
@@ -305,6 +317,9 @@
{
input5v_time=1;
flag_secondtask = 1;
+ #ifdef UWB_1_5HZ
+ uwb_time_count++;
+ #endif
if(!read_5v_input_pca())
{
if(bat_percent>15)
@@ -321,10 +336,11 @@
input5v_time=1;
if(taglist_num==0)
{
- CloseUWB();
- Uwb_init();
- OpenUWB();
+// CloseUWB();
+// Uwb_init();
+// OpenUWB();
}
+ upload_apppoll();
}else{
flag_secondtask = 0;
}
@@ -365,6 +381,7 @@
send_struct.alarmDistence=prewarning_distance;//更新报警距离
memcpy(&send_struct.gunLableId,&g_com_map[BIND_DEV_ID],2);//更新绑定ID
send_struct.tagId=dev_id;//更新设备ID
+ tag_frequency = 1000/g_com_map[COM_INTERVAL];
// g_com_map[IP_0]=111;
// g_com_map[IP_1]=198;
@@ -414,7 +431,7 @@
}
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|7;
+ g_com_map[VERSION] = (1<<8)|10;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -467,7 +484,7 @@
{
nomove_count = 0;
// adctick = HIDO_TimerGetTick();
- if(HIDO_TimerGetTick()-adctick>60) //10分钟采样一次 电量
+ if(HIDO_TimerGetTick()-adctick>600) //10分钟采样一次 电量
{
chongman_time=chongman_time+60;
adctick = HIDO_TimerGetTick();
@@ -479,7 +496,7 @@
only_one_flag=1;
chongman_time=0;
}
- if(bat_percent>=99&&chongman_time>=600)
+ if(bat_percent>=99&&chongman_time>=180)
{
powerled = GREEN;
}else{
@@ -523,6 +540,7 @@
g_com_map[CNT_RESTART]=0;
save_com_map_to_flash();
NVIC_SystemReset();
+
}
}
else
@@ -557,7 +575,7 @@
{
g_com_map[CNT_RESTART]=0;
NVIC_SystemReset();
-
+
}
if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0)
{
@@ -580,17 +598,23 @@
// UART0 TX/RX
io_pin_mux_set(IO_PIN_5, IO_FUNC0);
io_pin_mux_set(IO_PIN_6, IO_FUNC0);
+ gpio_pin_set_dir(IO_PIN_5 , GPIO_DIR_OUT, 0);
+ gpio_pin_set_dir(IO_PIN_6 , GPIO_DIR_OUT, 0);
// UART1 RX/TX
io_pin_mux_set(IO_PIN_10, IO_FUNC0);
io_pin_mux_set(IO_PIN_9, IO_FUNC0);
+
uart_close(UART_ID1);//解绑原来串口1
uart_close(UART_ID0);//解绑原来串口0
}
extern uint32_t uwb_time_count;
+uint8_t GPS_UPLOAD_FLAG=0;
void upload_apppoll()
{
- uint32_t elapsed_time_jibu;
+ uint32_t elapsed_time_jibu;
+#ifdef UWB_1_5HZ
+
switch (current_state)
{
@@ -599,17 +623,20 @@
switch(elapsed_time_jibu)
{
case UWB_OPEN_COUNT:
-
- CloseUWB();
+ CloseUWB();
+// uwbled = LEDOFF;
+ UWBSendUDPTask();
+ GPS_UPLOAD_FLAG=1;
break;
case UWB_MEASUREMENT_INTERVAL:
- OpenUWB();
- state_start_time = uwb_time_count;
+ OpenUWB();
+// uwbled = WHITE;
+ state_start_time = uwb_time_count;
+
break;
}
break;
-
case STATE_SLEEP:
elapsed_time_jibu = uwb_time_count - state_start_time;
switch(elapsed_time_jibu)
@@ -627,7 +654,7 @@
}
break;
}
-
+#endif
}
uint8_t flag_4guart_needinit=0;
@@ -684,6 +711,7 @@
IIC2_Init();
Accelerometer_Init();
PCA9555_init();
+ WT588E02B_Init();
adc_open(&usr_adc_cfg);
uart_receive(UART_ID1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE,uart_receive_callback);
power_init();
@@ -693,7 +721,9 @@
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
pca_input_detection_init(pca_handler);//pca检测输入
Uwb_init();
- OpenUWB();
+ #ifdef UWB_CK
+ OpenUWB();
+ #endif
// DBG_SetMode(DBG_MODE_SHELL);
// Shell_Init();
@@ -727,7 +757,7 @@
flag_secondtask = 0;
SecondTask();
}
- IMUTask();
+ IMUTask();
IdleTask();
}
}
--
Gitblit v1.9.3