From dd0d5d99bb183eeb6074f9bd4ddbff96104bd95d Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 05 七月 2020 23:46:24 +0800
Subject: [PATCH] V1.11防撞9对5测试完成，发给华星

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

diff --git a/Inc/main.h b/Inc/main.h
index 5fa0da2..6714629 100644
--- a/Inc/main.h
+++ b/Inc/main.h
@@ -47,13 +47,19 @@
 extern ADC_HandleTypeDef hadc;
 extern LPTIM_HandleTypeDef hlptim1;
 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 USART_KEEPWAKE_TIME 60
+#define LPTIMER_1S_COUNT 32767
+#define USART_KEEPWAKE_TIME 10
+#define KEY_KEEPRESET_TIME 5
 /* USER CODE END EC */
 
 /* Exported macro ------------------------------------------------------------*/

--
Gitblit v1.9.3