From 2eeb6bd4fbcb8fc684f022f411b49bffb45671f1 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 22 十月 2021 18:19:00 +0800
Subject: [PATCH] 测试完成
---
Src/main.c | 105 +++++++++++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 50 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index c580d25..ad15dbb 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -254,38 +254,38 @@
u16 slotpos_intoatl;
uint16_t bigslot_num;
uint8_t fix_slotpos =FIXSLOTPOS;
-int32_t lpcount,lptime,target_time;
-extern u16 tagslotpos;
+//u16 lpcount,lptime,;
+//extern u16 tagslotpos;
void SetNextPollTime(u16 slotpos) //时间片逻辑：上来默认计算一个时间，时间同步之后，就近选择时间片。SetNextPollTime会调整下次发送
{
-#ifdef FIXSLOT
- fix_slotpos =FIXSLOTPOS;
- fix_slotpos = g_com_map[ALARM_DISTANCE2];
- slotpos = fix_slotpos;
- tagslotpos = fix_slotpos;
-#endif
+//#ifdef FIXSLOT
+// fix_slotpos =FIXSLOTPOS;
+// fix_slotpos = g_com_map[ALARM_DISTANCE2];
+// slotpos = fix_slotpos;
+// tagslotpos = fix_slotpos;
+//#endif
- while(current_slotnum>=tag_frequency)
- { current_slotnum-=tag_frequency;}
- slotpos_intoatl = current_slotnum*bigslot_num+slotpos;
+// while(current_slotnum>=tag_frequency)
+// { current_slotnum-=tag_frequency;}
+// slotpos_intoatl = current_slotnum*bigslot_num+slotpos;
- if(current_slotnum==19)
- {slotpos_intoatl = current_slotnum*bigslot_num+slotpos;}
- target_time=(slotpos_intoatl*SLOTTIME_MS+100)*100;
-
- //if(target_time<90000)
- {
- lptime=target_time-offsettimeus+1200;
- lpcount = lptime/LPTIMER_LSB;
- if(lpcount>LPTIMER_1S_COUNT)
- lpcount-=LPTIMER_1S_COUNT;
- if(lpcount<0)
- {
- lpcount+=LPTIMER_1S_COUNT;
- }
- __HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount);
-}
+// if(current_slotnum==19)
+// {slotpos_intoatl = current_slotnum*bigslot_num+slotpos;}
+// target_time=(slotpos_intoatl*SLOTTIME_MS+100)*100;
+//
+// //if(target_time<90000)
+// {
+// lptime=target_time-offsettimeus+1200;
+// lpcount = lptime/LPTIMER_LSB;
+// if(lpcount>LPTIMER_1S_COUNT)
+// lpcount-=LPTIMER_1S_COUNT;
+// if(lpcount<0)
+// {
+// lpcount+=LPTIMER_1S_COUNT;
+// }
+// __HAL_LPTIM_COMPARE_SET(&hlptim1, lpcount);
+//}
}
void ErrorConfig_Handler(void)
{
@@ -321,13 +321,14 @@
g_com_map[COM_INTERVAL]=100;
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
-// g_com_map[IMU_ENABLE]=0;
+ g_com_map[IMU_ENABLE]=0;
// g_com_map[COM_INTERVAL]=50;
#endif
-//g_com_map[NOMOVESLEEP_TIME]=10;
-// g_com_map[IMU_ENABLE]=0;
-// g_com_map[COM_INTERVAL]=1000;
+g_com_map[NOMOVESLEEP_TIME]=1000;
+ g_com_map[IMU_ENABLE]=0;
+ g_com_map[COM_INTERVAL]=1000;
active_flag = g_com_map[ACTIVE_INDEX];
+ active_flag = 1;
if(active_flag==0)
{
g_com_map[COM_INTERVAL]=1000;
@@ -390,12 +391,12 @@
{
case 1:
- 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;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
- HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+ 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;
+ GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
+ HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
break;
case 2:
MX_TIM2_Init();
@@ -438,7 +439,7 @@
/* Initialize all configured peripherals */
MX_GPIO_Init();
MX_LPTIM1_Init();
- MX_DMA_Init();
+ MX_DMA_Init();
MX_USART1_UART_Init();
MX_SPI1_Init();
MX_ADC_Init();
@@ -478,9 +479,21 @@
// {
// MODBUS_Poll();
// }
+ if(waitusart_timer>0)
+ {
+ waitusart_timer--;
+ }
+ if(m_bEUARTTxEn==0&&waitusart_timer==0&&(motor_state==0||motor_state==3))
+ {
+ HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_RESET);
+#ifndef DEBUG_MODE
+ if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
+ HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
+#endif
+ }
+ active_flag = 1;
if(g_start_send_flag&&active_flag)
{ static uint16_t blink_count=0;
- SystemClock_Config();
g_start_send_flag = 0;
// GetPressAndTemp();
// if(current_count>slot_startcount&¤t_count<slot_startcount+interval_count)
@@ -490,6 +503,7 @@
// HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_RESET);
// }
// LED_TR_BLINK;
+
if(bat_percent>15)
{ LED_TB_ON;
Tag_App();
@@ -501,17 +515,6 @@
}
//LED0_BLINK;
IdleTask();
- if(waitusart_timer>0)
- {
- waitusart_timer--;
- }
- if(m_bEUARTTxEn==0&&waitusart_timer==0&&(motor_state==0||motor_state==3))
- {
-#ifndef DEBUG_MODE
- if(!HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
- HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
-#endif
- }
}else{
@@ -959,6 +962,8 @@
{
static uint8_t i=0;
i++;
+ HAL_GPIO_WritePin(LED1_G_GPIO_Port, LED1_G_Pin, GPIO_PIN_SET);
+ SystemClock_Config();
g_start_send_flag=1;
current_slotnum++;
--
Gitblit v1.9.3