From 932b0ff31177b22810351183c9c47e82589167cd Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期二, 17 十二月 2024 14:52:23 +0800
Subject: [PATCH] 开关机逻辑完成，可实现无jlink下开关机
---
keil/include/main/main.c | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/keil/include/main/main.c b/keil/include/main/main.c
index e267301..e2a3a44 100644
--- a/keil/include/main/main.c
+++ b/keil/include/main/main.c
@@ -300,25 +300,28 @@
}
}
void UserKeyTask(void)
- {
- if(!GET_USERKEY)
+{
+ if(read_powerkey_input_pca())
{
- if(HIDO_TimerGetTick() - keystarttime>3)
+ if(HIDO_TimerGetTick() - keystarttime>2)
{
userkey_state = 1;
keystarttime = HIDO_TimerGetTick();
- UDPClient_UploadGPS();
+ PCA9555_Set_One_Value_Output(PWR_ENABLE,0);//低电平关闭
+ PCA9555_Set_One_Value_Output(GPS_LED,0);//输出低电平关闭LED
+ //UDPClient_UploadGPS();
}
- if(HIDO_TimerGetTick() - keystarttime2>10)
- {
- g_com_map[CNT_RESTART] = 1;
- }
+// if(HIDO_TimerGetTick() - keystarttime2>10)
+// {
+//
+// g_com_map[CNT_RESTART] = 1;
+// }
}else
{
keystarttime = HIDO_TimerGetTick();
keystarttime2 = HIDO_TimerGetTick();
}
- }
+}
void MinuteTask(void)
{
PCA9555_Set_One_Value_Output(ADC_MINIUS,0);//拉低
@@ -605,7 +608,7 @@
delay_ms(500);
Set4LEDColor(RED,WHITE,RED,WHITE);
delay_ms(500);
- Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
+ //Set4LEDColor(LEDOFF,LEDOFF,LEDOFF,LEDOFF);
}
//IO_control_init();
// io_pin_mux_set(SCL_PIN, IO_FUNC0);//测试测距波形
@@ -638,6 +641,7 @@
while (1)
{
uwb_app_poll();
+
//test4=gpio_pin_get_val(SCL_PIN);
//UWBPoll();
// if(!power_low_flag)//确认是否休眠下才开启功能
@@ -672,7 +676,7 @@
SecondTask();
}
-// UserKeyTask();
+ UserKeyTask();
// IMUTask();
IdleTask();
#ifndef DEBUG_MODE
--
Gitblit v1.9.3