From e5e8561aca3f7fd61596c425745fb954926f1965 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期四, 15 六月 2023 15:27:06 +0800
Subject: [PATCH] V1.67 1.修复基站电量检测不对bug。       2.重新生成了cube       3小组ID改成3

---
 Inc/main.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Inc/main.h b/Inc/main.h
index ecdaf2a..5b39393 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -52,13 +52,15 @@
 typedef uint8_t  u8;
 extern uint16_t slottime,max_slotpos,current_slotnum;
 void SetNextPollTime(u16 time);
+void MX_ADC_Init(void);
+void MX_ADC_DeInit(void);
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
 /* USER CODE BEGIN EC */
 #define LPTIMER_LSB 30.518 //1 puls=30.518us
 #define LPTIMER_1S_COUNT 32767
-#define USART_KEEPWAKE_TIME 10
+#define USART_KEEPWAKE_TIME 2
 #define KEY_KEEPRESET_TIME 5
 /* USER CODE END EC */
 
@@ -88,8 +90,6 @@
 #define USER_KEY_Pin GPIO_PIN_1
 #define USER_KEY_GPIO_Port GPIOB
 #define USER_KEY_EXTI_IRQn EXTI0_1_IRQn
-#define MOTOR_Pin GPIO_PIN_10
-#define MOTOR_GPIO_Port GPIOB
 #define INPUT_5V_Pin GPIO_PIN_11
 #define INPUT_5V_GPIO_Port GPIOB
 #define LED1_G_Pin GPIO_PIN_12
@@ -106,6 +106,8 @@
 #define LED2_R_GPIO_Port GPIOB
 #define PWR_ON_Pin GPIO_PIN_7
 #define PWR_ON_GPIO_Port GPIOB
+#define PWR_CTL_Pin GPIO_PIN_9
+#define PWR_CTL_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
 #define GET_IMUINT 		HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0)
 #define GET_USERKEY 	HAL_GPIO_ReadPin(USER_KEY_GPIO_Port,USER_KEY_Pin)

--
Gitblit v1.9.3