From 3e165b6f13bfaf66385d857819cacff6e4d6f37c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 20 六月 2020 22:31:03 +0800
Subject: [PATCH] 时间同步完成，多基站有问题，时间不对

---
 Inc/main.h |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/Inc/main.h b/Inc/main.h
index 07f257d..07df619 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -43,16 +43,22 @@
 /* USER CODE BEGIN ET */
 extern SPI_HandleTypeDef hspi1;
 extern UART_HandleTypeDef huart1;
-extern uint8_t g_start_send_flag;
+extern uint8_t g_start_send_flag,bat_percent,group_id;
 extern ADC_HandleTypeDef hadc;
 extern LPTIM_HandleTypeDef hlptim1;
-extern uint16_t lastpoll_count,interval_count,slot_startcount;
+extern uint16_t lastpoll_count,interval_count,slot_startcount,tag_frequency,tyncpoll_time,waitusart_timer;
+typedef uint32_t  u32;
+typedef uint16_t u16;
+typedef uint8_t  u8;
+extern uint16_t slottime,max_slotpos,current_slotnum;
+void SetNextPollTime(u16 time);
 /* USER CODE END ET */
 
 /* Exported constants --------------------------------------------------------*/
 /* USER CODE BEGIN EC */
 #define LPTIMER_LSB 30.518 //1 puls=30.518us
-#define LPTIMER_1S_COUNT 33095
+#define LPTIMER_1S_COUNT 32767
+#define USART_KEEPWAKE_TIME 60
 /* USER CODE END EC */
 
 /* Exported macro ------------------------------------------------------------*/
@@ -83,6 +89,8 @@
 #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
 #define LED1_G_GPIO_Port GPIOB
 #define LED1_R_Pin GPIO_PIN_13
@@ -98,7 +106,8 @@
 #define PWR_ON_Pin GPIO_PIN_7
 #define PWR_ON_GPIO_Port GPIOB
 /* USER CODE BEGIN Private defines */
-#define GET_IMUINT HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0)
+#define GET_IMUINT 		HAL_GPIO_ReadPin(GPIOA,GPIO_PIN_0)
+#define GET_USERKEY 	HAL_GPIO_ReadPin(USER_KEY_GPIO_Port,USER_KEY_Pin)
 /* USER CODE END Private defines */
 
 #ifdef __cplusplus

--
Gitblit v1.9.3