From 01b6f2525f47ee781d86a2495dfcd17f68ccbafd Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 17 六月 2025 11:54:47 +0800
Subject: [PATCH] 通过debug已经测试功能正常，移植到正确的工卡试下
---
keil/include/main/main.c | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index 0b5a648..b2fa64e 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -48,6 +48,7 @@
#define INACTIVE_TIMEOUT 30
+uint8_t input5v_flag=0;
extern uint8_t mUsartReceivePack[100];
extern uint8_t mUsart2ReceivePack[150];
extern uint8_t state5V_prase_flag,gps_prase_flag;
@@ -275,6 +276,7 @@
}
}
+uint16_t gaodu;
uint8_t guanjiflag;
uint8_t heartbeasend_flag;
uint32_t guanjiflagtime;
@@ -366,6 +368,7 @@
HIDO_TimerTick();
// if(nomove_count<=g_com_map[NOMOVESLEEP_TIME])//防止溢出
nomove_count++;
+ gaodu=GetPressAndHeight()*100;
// else{
// nomove_count=g_com_map[NOMOVESLEEP_TIME]+1;
// }
@@ -586,7 +589,7 @@
// }
g_com_map[MODBUS_MODE] = 0;
log_4g_enable_flag=g_com_map[LOG_4G_ENABLE];
- g_com_map[VERSION] = (1<<8)|22;
+ g_com_map[VERSION] = (1<<8)|23;
LOG_INFO(TRACE_MODULE_APP,"设备ID: %x .\r\n",dev_id);
@@ -627,6 +630,10 @@
{
if(read_5v_input_pca())
{
+ if(input5v_flag==0)
+ {
+ NVIC_SystemReset();
+ }
if(state5v==0)
{
state5v=1;
@@ -902,7 +909,6 @@
int test1,test3;
uint32_t test4;
extern uint8_t receive_flag;
-uint16_t gaodu;
static void app_wdt_callback(void *dev, uint32_t status)
{
ASSERT(status, "WDT TIMEOUT，程序复位");
@@ -921,14 +927,16 @@
boot_deinit();
board_pins_config();
gpio_open();
- IIC2_Init();
- Accelerometer_Init();
+ IIC2_Init();
+ Accelerometer_Init();
+
// delay_ms(100);
BarInit();
// delay_ms(100);
// gaodu=GetPressAndHeight();
PCA9555_init();
- board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_115200);
+ board_debug_console_open_baud(TRACE_PORT_UART1,BAUD_921600);
+ pca_input_detection_init(pca_handler);//pca检测输入
// while(1);
// Reset reason
reset_cause_get();
@@ -986,6 +994,7 @@
delay_ms(500);
Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
}
+
g_com_map[MODBUS_MODE] = 0;
state5v=0;
state5V_prase_flag=state5v;
@@ -1000,8 +1009,10 @@
sleep_timer_start(__MS_TO_32K_CNT(SLEEP_TIMER_NUM));//测试
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
adc_get(&sample[0], NUM_SAMPLES, adc_callback);//adc采样
- pca_input_detection_init(pca_handler);//pca检测输入
+
gaodu=GetPressAndHeight()*100;
+ if(read_init_5v_input_pca())
+ {input5v_flag=1;}
while (1)
{
@@ -1020,6 +1031,7 @@
flag_secondtask = 0;
SecondTask();
}
+ SC7A22H_get_Pedo_task();
IMUTask();
IdleTask();
check_step_and_update_state();
--
Gitblit v1.9.3