From 73950f3f8992e4f227efd5c13e8beb736ef19237 Mon Sep 17 00:00:00 2001
From: stark1898y <1658608470@qq.com>
Date: Mon, 2 Dec 2024 13:13:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98,=E5=85=B3=E6=8E=89=E4=B8=B2?=
=?UTF-8?q?=E5=8F=A3=2052uA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.settings/language.settings.xml | 2 +-
APP/bsp_wf5803.c | 33 +++++++++++++++++++++------------
APP/peripheral_main.c | 7 ++++---
StdPeriphDriver/CH58x_sys.c | 4 ++--
4 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index 9337699..fc334b3 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -5,7 +5,7 @@
-
+
diff --git a/APP/bsp_wf5803.c b/APP/bsp_wf5803.c
index 958a62f..bd6fdce 100644
--- a/APP/bsp_wf5803.c
+++ b/APP/bsp_wf5803.c
@@ -5,7 +5,7 @@
#include "log.h"
#undef LOG_ENABLE
-#define LOG_ENABLE 1
+#define LOG_ENABLE 0
typedef enum
@@ -129,7 +129,6 @@ void PRESS_IO_SPI_Init(void)
PRESS_SPI_CsStop(kPressOut);
PRESS_SPI_CsStop(kPressAtom);
-
GPIOA_ModeCfg(GPIO_Pin_13 | GPIO_Pin_14, GPIO_ModeOut_PP_5mA);
GPIOA_ModeCfg(GPIO_Pin_15, GPIO_ModeIN_PU);
@@ -173,23 +172,29 @@ void Lower_IO_Deinit(void)
GPIOB_ModeCfg(GPIO_Pin_4 | GPIO_Pin_8 | GPIO_Pin_9 | GPIO_Pin_16 | GPIO_Pin_17, GPIO_ModeIN_PD);
// KEY
- GPIOB_ResetBits(GPIO_Pin_0);
+ GPIOB_SetBits(GPIO_Pin_0);
// 由外部上拉电阻了
GPIOB_ModeCfg(GPIO_Pin_0, GPIO_ModeIN_Floating);
// motor
- GPIOA_ResetBits(GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9);
- GPIOA_ModeCfg(GPIO_Pin_7 | GPIO_Pin_8 | GPIO_Pin_9, GPIO_ModeOut_PP_5mA);
+ GPIOA_ResetBits(GPIO_Pin_8 | GPIO_Pin_9);
+ GPIOA_ModeCfg(GPIO_Pin_8 | GPIO_Pin_9, GPIO_ModeIN_PD);
- // 3V8_EN
GPIOA_ResetBits(GPIO_Pin_7);
-// 由外部上拉电阻了
- GPIOA_ModeCfg(GPIO_Pin_7, GPIO_ModeOut_PP_5mA);
+ GPIOA_ModeCfg(GPIO_Pin_7, GPIO_ModeIN_PD);
+
+// // nsleep
+// GPIOA_ResetBits(GPIO_Pin_7);
+// // 由外部上拉电阻了
+// GPIOA_ModeCfg(GPIO_Pin_7, GPIO_ModeOut_PP_5mA);
// ADC_VBAT
- GPIOA_ResetBits(GPIO_Pin_1);
+ GPIOADigitalCfg(DISABLE, GPIO_Pin_1);
+ // GPIOA_ResetBits(GPIO_Pin_1);
GPIOA_ModeCfg(GPIO_Pin_1, GPIO_ModeIN_Floating);
+ // RB_PIN_ADC11_IE
+ // RB_PIN_ADC11_IE
// 4g的串口也得deinit
// 4G
@@ -199,8 +204,13 @@ void Lower_IO_Deinit(void)
// 由外部上拉电阻了
GPIOB_ModeCfg(GPIO_Pin_3, GPIO_ModeOut_PP_5mA);
- GPIOB_ResetBits(GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7);
- GPIOB_ModeCfg(GPIO_Pin_12 | GPIO_Pin_13 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7, GPIO_ModeIN_PD);
+ // NET_TXD
+ GPIOB_SetBits(GPIO_Pin_12);
+// 由外部上拉电阻了
+ GPIOB_ModeCfg(GPIO_Pin_12, GPIO_ModeIN_Floating);
+
+ GPIOB_ResetBits(GPIO_Pin_13 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7);
+ GPIOB_ModeCfg(GPIO_Pin_13 | GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7, GPIO_ModeIN_PD);
}
void PRESS_LowPower(void)
@@ -318,7 +328,6 @@ uint16_t WF5803_ProcessEvent(uint8_t task_id, uint16_t events)
PRINT("< %d\r\n", press_value[kPressOut] - press_value[kPressIn]);
}
-
tmos_start_task(press_task_id, WF5803_EVT_START, MS1_TO_SYSTEM_TIME(800));
logDebug("WF5803_EVT_READ");
diff --git a/APP/peripheral_main.c b/APP/peripheral_main.c
index b4fd110..cfb87f9 100644
--- a/APP/peripheral_main.c
+++ b/APP/peripheral_main.c
@@ -22,7 +22,7 @@
#include "log.h"
#undef LOG_ENABLE
-#define LOG_ENABLE 1
+#define LOG_ENABLE 0
#define SYSTICK_INTERVAL (1)
@@ -72,14 +72,15 @@ int main(void)
#endif
HSECFG_Capacitance(HSECap_18p);
SetSysClock(CLK_SOURCE_HSE_PLL_62_4MHz);
- SysTick_Config( GetSysClock() / 1000 * SYSTICK_INTERVAL); //锟借定锟斤拷锟绞憋拷锟�1ms
+ // SysTick_Config( GetSysClock() / 1000 * SYSTICK_INTERVAL); //锟借定锟斤拷锟绞憋拷锟�1ms
+
// 3V8_EN
GPIOB_ResetBits(GPIO_Pin_3);
// 由外部上拉电阻了
GPIOB_ModeCfg(GPIO_Pin_3, GPIO_ModeOut_PP_5mA);
#if(defined(HAL_SLEEP)) && (HAL_SLEEP == TRUE)
- GPIOA_ModeCfg(GPIO_Pin_All, GPIO_ModeIN_PD);
+ GPIOA_ModeCfg(GPIO_Pin_All, GPIO_ModeIN_PU);
GPIOB_ModeCfg(GPIO_Pin_All, GPIO_ModeIN_PD);
#endif
diff --git a/StdPeriphDriver/CH58x_sys.c b/StdPeriphDriver/CH58x_sys.c
index ec954a6..a54d0c4 100644
--- a/StdPeriphDriver/CH58x_sys.c
+++ b/StdPeriphDriver/CH58x_sys.c
@@ -6,7 +6,7 @@
* Description : source file(ch585/ch584)
*********************************************************************************
* Copyright (c) 2021 Nanjing Qinheng Microelectronics Co., Ltd.
- * Attention: This software (modified or not) and binary are used for
+ * Attention: This software (modified or not) and binary are used for
* microcontroller manufactured by Nanjing Qinheng Microelectronics.
*******************************************************************************/
@@ -572,7 +572,7 @@ void mDelaymS(uint16_t t)
int _write(int fd, char *buf, int size)
{
- BSP_Uart3_Send_Data(buf, size);
+ // BSP_Uart3_Send_Data(buf, size);
return size;
}