From 8a2a686ae7a102b628f0a2b6c63b73b3f5ce573b Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期四, 17 四月 2025 16:23:34 +0800
Subject: [PATCH] 最新ota,适配4g手环升级与最新boot

---
 keil/include/board/board.c |   49 ++++++++++++++++++++++++-------------------------
 1 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index fc7b427..6f8dc04 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -415,7 +415,6 @@
 		gpio_pin_set_dir(ACCLERATE_DETECT_Pin , GPIO_DIR_IN, 0);
 		io_pull_set(ACCLERATE_DETECT_Pin, IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
     gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
-	
 }
 void board_4GUsart_detection_init(GPIO_IRQ_HANDLER_T irq_handler)  //4G 串口输入检测中断,下拉触发
 {
@@ -424,7 +423,7 @@
 		gpio_pin_set_dir(_4G_USART_RX_Pin , GPIO_DIR_IN, 0);
 		io_pull_set(_4G_USART_RX_Pin, IO_PULL_UP, IO_PULL_UP_LEVEL2);
         gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
-		power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW);
+//		power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW);
 }
 void pca_input_detection_init(GPIO_IRQ_HANDLER_T irq_handler)
 {
@@ -444,11 +443,11 @@
     power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)BOARD_SW_1, POWER_WAKEUP_LEVEL_LOW);
 }
 
-void board_led_init(void)
-{
-    gpio_pin_set_dir(BOARD_LED_1, GPIO_DIR_OUT, 0);
-    gpio_pin_set_dir(BOARD_LED_2, GPIO_DIR_OUT, 0);
-}
+//void board_led_init(void)
+//{
+//    gpio_pin_set_dir(BOARD_LED_1, GPIO_DIR_OUT, 0);
+//    gpio_pin_set_dir(BOARD_LED_2, GPIO_DIR_OUT, 0);
+//}
 
 void board_led_on(enum IO_PIN_T idx)
 {
@@ -464,24 +463,24 @@
 {
     gpio_pin_toggle(idx);
 }
-void LED_output_init(void)
-{		
-			//LEDgpio控制
-		io_pin_mux_set(WS2812_PIN, IO_FUNC0);
-    gpio_pin_set_dir(WS2812_PIN , GPIO_DIR_OUT, 0);
-    io_pull_set(WS2812_PIN,IO_HIGH_Z,IO_PULL_UP_NONE);//3
+//void LED_output_init(void)
+//{		
+//			//LEDgpio控制
+//		io_pin_mux_set(WS2812_PIN, IO_FUNC0);
+//    gpio_pin_set_dir(WS2812_PIN , GPIO_DIR_OUT, 0);
+//    io_pull_set(WS2812_PIN,IO_HIGH_Z,IO_PULL_UP_NONE);//3
 
-}
+//}
 void board_configure(void)
 {
 }
 
-void board_prepare_for_power_down(void)
-{
-#if !defined(CELL_PHONE_EN)
-    board_led_off(BOARD_LED_1);
-#endif
-}
+//void board_prepare_for_power_down(void)
+//{
+//#if !defined(CELL_PHONE_EN)
+//    board_led_off(BOARD_LED_1);
+//#endif
+//}
 
 void board_restore_from_power_down(void)
 {
@@ -494,17 +493,17 @@
     uci_tl_resume();
 #else
     // button - restore interrupt type
-	gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
-	gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
+	gpio_enable_irq(PCA_INPUT_DETECT, GPIO_IRQ_TYPE_RISING_EDGE, pca_input_detect_irq_handler);
+//	gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
 //    if (button_irq_handler)
 //    {
 //        gpio_enable_irq(BOARD_SW_1, GPIO_IRQ_TYPE_FALLING_EDGE, button_irq_handler);
 //    }
 #endif
 
-#if !defined(CELL_PHONE_EN)
-    board_led_on(BOARD_LED_1);
-#endif
+//#if !defined(CELL_PHONE_EN)
+//    board_led_on(BOARD_LED_1);
+//#endif
 
     // system timer
     sys_timer_open();

--
Gitblit v1.9.3