From 0d1f703f0e55af724fdcc564c418778656084d12 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 10 六月 2022 09:59:48 +0800
Subject: [PATCH] V1.28 未激活充电不亮绿灯bug
---
Src/main.c | 70 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 27 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 3c2efac..8890ac6 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -188,6 +188,7 @@
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
nomove_count = 0;
+ bat_percent=Get_Battary();
if(state5v==0)
{
state5v=1;
@@ -282,7 +283,7 @@
{
case 1:
- HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(GPIOB, MOTOR_Pin, GPIO_PIN_SET);
GPIO_InitStruct.Pin = MOTOR_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
@@ -295,6 +296,7 @@
break;
}
}
+u8 active_flag,nomovesleeptime;
void Program_Init(void)
{ float temp;
uint16_t temp2;
@@ -305,7 +307,27 @@
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] = 0x0118;
+ g_com_map[VERSION] = (1<<8)|28;
+ active_flag = g_com_map[ACTIVE_INDEX];
+ module_power = g_com_map[POWER];
+ imu_enable=g_com_map[IMU_ENABLE];
+ motor_enable=g_com_map[MOTOR_ENABLE];
+
+ 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;
+ 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;
+ lastpoll_time=tyncpoll_time;
+ tag_frequency = 1000/g_com_map[COM_INTERVAL];
+ total_slotnum = 1000/g_com_map[COM_INTERVAL];
+ nomovesleeptime = g_com_map[NOMOVESLEEP_TIME];
+ if(active_flag==0)
+ {
+ imu_enable=1;
+ nomovesleeptime =10;
+ }
#ifdef DEBUG_MODE
// g_com_map[DEV_ROLE]=1;
// g_com_map[DEV_ID]=1;
@@ -321,19 +343,7 @@
{module_power=67;}
if(module_power<0)
{module_power=0;}
- module_power = g_com_map[POWER];
- imu_enable=g_com_map[IMU_ENABLE];
- motor_enable=g_com_map[MOTOR_ENABLE];
-
- 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;
- 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;
- lastpoll_time=tyncpoll_time;
- tag_frequency = 1000/g_com_map[COM_INTERVAL];
- total_slotnum = 1000/g_com_map[COM_INTERVAL];
+
current_slotnum=1;
current_time=GetLPTime();
if (HAL_LPTIM_TimeOut_Start_IT(&hlptim1, LPTIMER_1S_COUNT, slot_startcount) != HAL_OK) //system time is 1010ms 1 puls=30.518us
@@ -405,10 +415,11 @@
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_LPTIM1_Init();
+ MX_DMA_Init();
MX_USART1_UART_Init();
MX_SPI1_Init();
MX_ADC_Init();
- MX_DMA_Init();
+
// MX_TIM2_Init();
/* USER CODE BEGIN 2 */
LED_LG_ON;
@@ -439,7 +450,7 @@
/* USER CODE END WHILE */
/* USER CODE BEGIN 3 */
- if(g_start_send_flag)
+ if(g_start_send_flag&&active_flag)
{ static uint16_t blink_count=0;
SystemClock_Config();
g_start_send_flag = 0;
@@ -450,9 +461,8 @@
// }else{
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
-// LED_TR_BLINK;
-
- bat_percent=Get_Battary();
+// LED_TR_BLINK;s
+ bat_percent=Get_Battary();
if(bat_percent>15)
{ LED_TB_ON;
Tag_App();
@@ -812,10 +822,12 @@
__HAL_RCC_GPIOB_CLK_ENABLE();
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOA, SCL_Pin|SDA_Pin|SPI_CS_Pin, GPIO_PIN_SET);
-
+ //HAL_GPIO_WritePin(GPIOA, SCL_Pin|SDA_Pin|SPI_CS_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(GPIOA, SPI_CS_Pin, GPIO_PIN_SET);
+
/*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
+ //HAL_GPIO_WritePin(GPIOB, BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
+ HAL_GPIO_WritePin(GPIOB, USER_SCL_Pin|USER_SDA_Pin|BAT_MEAS_GND_Pin|PWR_CTL_Pin, GPIO_PIN_SET);
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(GPIOB, LED1_G_Pin|LED1_R_Pin|LED2_R_Pin, GPIO_PIN_RESET);
@@ -830,11 +842,11 @@
HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
/*Configure GPIO pins : SCL_Pin SDA_Pin */
- GPIO_InitStruct.Pin = SCL_Pin|SDA_Pin;
+ GPIO_InitStruct.Pin = USER_SCL_Pin|USER_SDA_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_OD;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
- HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
+ HAL_GPIO_Init(SDA_GPIO_Port, &GPIO_InitStruct); //
/*Configure GPIO pin : SPI_CS_Pin */
GPIO_InitStruct.Pin = SPI_CS_Pin;
@@ -932,6 +944,10 @@
key_keeptime+=(float)g_com_map[COM_INTERVAL]/1000;
if(key_keeptime>=KEY_KEEPRESET_TIME)
{
+ g_com_map[ACTIVE_INDEX]=!active_flag;
+ save_com_map_to_flash();
+ MOTOR_ON;
+ HAL_Delay(2000);
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
}
}else{
@@ -943,11 +959,11 @@
}else{
stationary_flag = 0;
}
-if(nomove_count>=g_com_map[NOMOVESLEEP_TIME]-1&&imu_enable)
+if(nomove_count>=nomovesleeptime-1&&imu_enable)
{
tx_near_msg[TAGSTATE] = tx_near_msg[TAGSTATE]|GOINGSLEEPBIT;
}
- if(nomove_count>g_com_map[NOMOVESLEEP_TIME]&&imu_enable)
+ if(nomove_count>nomovesleeptime&&imu_enable)
{
mcu_sleep();
}
--
Gitblit v1.9.3