From e9628df331488a100bb4134469a3a0ce7f321625 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期一, 16 十二月 2024 14:30:12 +0800
Subject: [PATCH] 灯初步调通,颜色和设置的值一样,串口改变复用从中断改为轮询

---
 keil/include/board/board.c |   54 +++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index 6b581b1..fc7b427 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -62,7 +62,11 @@
 struct BOARD_PARAM_T board_param = {0};
 static GPIO_IRQ_HANDLER_T button_irq_handler = NULL;
 static GPIO_IRQ_HANDLER_T accelerate_irq_handler=NULL;
-static GPIO_IRQ_HANDLER_T _4Gusart_irq_handler=NULL;
+ GPIO_IRQ_HANDLER_T _4Gusart_irq_handler=NULL;
+ GPIO_IRQ_HANDLER_T pca_input_detect_irq_handler=NULL;
+extern struct UART_CFG_T test_uart_cfg;
+extern struct ADC_CFG_T usr_adc_cfg;
+extern volatile int32_t m_EUART_DMA_RXPtr;	
 void board_clock_run(void)
 {
     // default load cap
@@ -107,8 +111,16 @@
     trace_open(port, TRACE_BAUD_RATE);
     user_trace_port = port;
 #endif
-    LOG_INFO(TRACE_MODULE_APP, "Hello from MKSEMI!\r\n");
-    LOG_INFO(TRACE_MODULE_APP, "Build information %s\r\n", mk_build_inf);
+//    LOG_INFO(TRACE_MODULE_APP, "Hello from MKSEMI!\r\n");
+//    LOG_INFO(TRACE_MODULE_APP, "Build information %s\r\n", mk_build_inf);
+}
+//修改波特率函数
+void board_debug_console_open_baud(enum TRACE_PORT_T port,enum UART_BAUD_T baud_rate)
+{
+#if TRACE_EN
+    trace_open(port, baud_rate);
+    user_trace_port = port;
+#endif
 }
 
 void board_calibration_params_default(void)
@@ -393,7 +405,7 @@
 {
 		button_irq_handler = irq_handler;
     gpio_pin_set_dir(INPUT_5V_Pin , GPIO_DIR_IN, 0);
-    io_pull_set(INPUT_5V_Pin , IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
+    io_pull_set(INPUT_5V_Pin , IO_PULL_DOWN, IO_PULL_UP_NONE);
     gpio_enable_irq(INPUT_5V_Pin, GPIO_IRQ_TYPE_RISING_EDGE, button_irq_handler);
     //power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)INPUT_5V_Pin, POWER_WAKEUP_LEVEL_LOW);
 }
@@ -402,7 +414,8 @@
 		accelerate_irq_handler=irq_handler;
 		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);
+    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 串口输入检测中断,下拉触发
 {
@@ -411,6 +424,15 @@
 		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);
+}
+void pca_input_detection_init(GPIO_IRQ_HANDLER_T irq_handler)
+{
+		pca_input_detect_irq_handler=irq_handler;
+		gpio_pin_set_dir(PCA_INPUT_DETECT , GPIO_DIR_IN, 0);
+	io_pull_set(PCA_INPUT_DETECT, IO_PULL_UP, IO_PULL_UP_LEVEL2);
+	gpio_enable_irq(PCA_INPUT_DETECT, GPIO_IRQ_TYPE_FALLING_EDGE, pca_input_detect_irq_handler);
+	power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)PCA_INPUT_DETECT, POWER_WAKEUP_LEVEL_LOW);
 }
 void board_button_init(GPIO_IRQ_HANDLER_T irq_handler)
 {
@@ -442,7 +464,14 @@
 {
     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 board_configure(void)
 {
 }
@@ -456,14 +485,21 @@
 
 void board_restore_from_power_down(void)
 {
+	uart_open(UART_ID1, &test_uart_cfg);
+	AIR780EUartInit();
+	adc_open(&usr_adc_cfg);
+	
+	m_EUART_DMA_RXPtr = 0;//清空上次缓存器避免重复发
 #if defined(UCI_INTF_PORT)
     uci_tl_resume();
 #else
     // button - restore interrupt type
-    if (button_irq_handler)
-    {
-        gpio_enable_irq(BOARD_SW_1, GPIO_IRQ_TYPE_FALLING_EDGE, button_irq_handler);
-    }
+	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);
+//    if (button_irq_handler)
+//    {
+//        gpio_enable_irq(BOARD_SW_1, GPIO_IRQ_TYPE_FALLING_EDGE, button_irq_handler);
+//    }
 #endif
 
 #if !defined(CELL_PHONE_EN)

--
Gitblit v1.9.3