From c0c1ff032edd95fb1c8becf9dab14d6652b8ea1f Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期五, 30 五月 2025 16:22:20 +0800
Subject: [PATCH] 工装测试底板发货V1.0版本,增加默认g_com表组为150,按键按下后3s会重置标志位,避免重复启动免布线测功率模式

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

diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index fedea36..3e68218 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -63,7 +63,10 @@
 static GPIO_IRQ_HANDLER_T button_irq_handler = NULL;
 static GPIO_IRQ_HANDLER_T accelerate_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
@@ -110,6 +113,14 @@
 #endif
 //    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)
@@ -394,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,8 +413,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_NONE);
-        gpio_enable_irq(ACCLERATE_DETECT_Pin, GPIO_IRQ_TYPE_RISING_EDGE, accelerate_irq_handler);
+		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 串口输入检测中断,下拉触发
 {
@@ -412,7 +423,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);
+		power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)_4G_USART_RX_Pin, POWER_WAKEUP_LEVEL_LOW);
+}
+void gpio_change_detection_init(GPIO_IRQ_HANDLER_T irq_handler)
+{
+		pca_input_detect_irq_handler=irq_handler;
+		gpio_pin_set_dir(CHANGE_MODE_KEY , GPIO_DIR_IN, 0);
+	io_pull_set(CHANGE_MODE_KEY, IO_PULL_UP, IO_PULL_UP_LEVEL4);
+	gpio_enable_irq(CHANGE_MODE_KEY, GPIO_IRQ_TYPE_FALLING_EDGE, pca_input_detect_irq_handler);
+	power_wakeup_enable((enum POWER_WAKEUP_SOURCE_T)CHANGE_MODE_KEY, POWER_WAKEUP_LEVEL_LOW);
 }
 void board_button_init(GPIO_IRQ_HANDLER_T irq_handler)
 {
@@ -445,6 +464,17 @@
     gpio_pin_toggle(idx);
 }
 
+
+void LED_output_init(void)
+{		
+			//LEDgpio控制
+		io_pin_mux_set(LED_PIN, IO_FUNC0);
+		gpio_pin_set_dir( LED_PIN, GPIO_DIR_OUT, 0);
+		io_pull_set(LED_PIN , IO_PULL_DOWN, IO_PULL_UP_LEVEL4);
+//	//默认PA引脚
+//	io_pin_mux_set(IO_PIN_9, IO_FUNC6);
+//	io_pin_mux_set(IO_PIN_10, IO_FUNC6);
+}
 void board_configure(void)
 {
 }
@@ -455,17 +485,20 @@
     board_led_off(BOARD_LED_1);
 #endif
 }
-extern void _4gUsart_handler(enum IO_PIN_T pin);
+
 void board_restore_from_power_down(void)
 {
-   
-	//uart_open(UART_ID1, &test_uart_cfg);
+	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
-     gpio_enable_irq(_4G_USART_RX_Pin, GPIO_IRQ_TYPE_FALLING_EDGE, _4Gusart_irq_handler);
+	gpio_enable_irq(PCA_INPUT_DETECT, GPIO_IRQ_TYPE_FALLING_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);

--
Gitblit v1.9.3