From 02f55f588e8bf38da609f9b1f4fcb576e74b9074 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 25 五月 2022 17:53:11 +0800
Subject: [PATCH] 2.50 配合之江实验室，修改CH3
---
Src/main.c | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index a583eaa..90579c5 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -31,7 +31,7 @@
#define NSH1 0x0001
#define GP 0x0002
-//#define DEBUG_MODE
+#define DEBUG_MODE
/* USER CODE END Includes */
/* Private typedef -----------------------------------------------------------*/
@@ -281,12 +281,12 @@
hardware_pici= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+2);
hardware_type= STMFLASH_ReadHalfWord(FLASH_HARDWARE_VERSION_MAP+4);
//deca_sleep(1000);
- g_com_map[VERSION] = 0x0229;
+ g_com_map[VERSION] = (2<<8)|50;
// g_com_map[DEV_ID]=0x7;
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
-// g_com_map[DEV_ID]=0x4009;
+ g_com_map[DEV_ID]=0x4009;
// g_com_map[ACTIVE_INDEX]=1;
g_com_map[COM_INTERVAL]=50;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
@@ -313,7 +313,7 @@
group_id=g_com_map[GROUP_ID];
dev_id = g_com_map[DEV_ID];
//slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3;
- slottime = 5;
+ slottime = 5;
max_slotpos=g_com_map[COM_INTERVAL]/slottime;
tyncpoll_time=(g_com_map[DEV_ID]%max_slotpos)*slottime;
slot_startcount=tyncpoll_time*1000/LPTIMER_LSB;
@@ -352,14 +352,15 @@
void HardWareTypeDiffConfig(void)
{
-GPIO_InitTypeDef GPIO_InitStruct = {0};
-hardware_type=2;
-if(hardware_type == 0)
- hardware_type = 1;
+ GPIO_InitTypeDef GPIO_InitStruct = {0};
+ //if(g_com_map[MOTORBEEPER_INDEX]!=1&&g_com_map[MOTORBEEPER_INDEX]!=2)
+ {
+ g_com_map[MOTORBEEPER_INDEX] = 2;
+ }
+ hardware_type = g_com_map[MOTORBEEPER_INDEX];
switch(hardware_type)
{
- case 1:
-
+ case 1:
HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
GPIO_InitStruct.Pin = MOTOR_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
@@ -428,7 +429,8 @@
{
Error_Handler();
}
-
+ LIS3DH_Check();
+
// HAL_Delay(2000);
// mcu_sleep();
//LED0_BLINK;
@@ -911,6 +913,8 @@
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
HAL_GPIO_Init(GPIOC, &GPIO_InitStruct);
+ LIS3DH_Check();
+
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
HAL_PWR_DisableWakeUpPin(PWR_WAKEUP_PIN1);
/*Clear all related wakeup flags*/
--
Gitblit v1.9.3