From 75544b683feca0b57fb7d5fa00cbc376dc6e62a5 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 04 七月 2025 18:06:30 +0800
Subject: [PATCH] V1.28 针对东营高精度方案，专网匹配，去掉了4G入网 APN和查询IP的代码。
---
keil/include/board/board.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/keil/include/board/board.c b/keil/include/board/board.c
index bd94c88..d83ff4d 100644
--- a/keil/include/board/board.c
+++ b/keil/include/board/board.c
@@ -44,6 +44,7 @@
#include "mk_calib.h"
#include "mk_misc.h"
#include "mk_uwb.h"
+#include <global_param.h>
#ifdef WSF_EN
#include "wsf_nvm.h"
#endif
@@ -423,13 +424,13 @@
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)
{
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);
+ io_pull_set(PCA_INPUT_DETECT, IO_PULL_UP, IO_PULL_UP_LEVEL4);
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);
}
@@ -481,11 +482,13 @@
board_led_off(BOARD_LED_1);
#endif
}
-
+extern uint32_t gpsbaudrate;
void board_restore_from_power_down(void)
-{
+{
+ test_uart_cfg.baud=gpsbaudrate;
uart_open(UART_ID1, &test_uart_cfg);
AIR780EUartInit();
+
adc_open(&usr_adc_cfg);
m_EUART_DMA_RXPtr = 0;//清空上次缓存器避免重复发
@@ -493,8 +496,8 @@
uci_tl_resume();
#else
// button - restore interrupt type
- 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);
+ 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);
--
Gitblit v1.9.3