From 872680732f92d36073fef464499bac46ec6bd56b Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 22 十一月 2022 15:05:25 +0800
Subject: [PATCH] 1.43 6.5g
---
Src/main.c | 91 ++++++++-------------------------------------
1 files changed, 17 insertions(+), 74 deletions(-)
diff --git a/Src/main.c b/Src/main.c
index 21dc8d0..0d97716 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -75,7 +75,7 @@
static void MX_LPTIM1_Init(void);
static void MX_USART1_UART_Init(void);
static void MX_SPI1_Init(void);
-static void MX_ADC_Init(void);
+void MX_ADC_Init(void);
static void MX_DMA_Init(void);
static void MX_TIM2_Init(void);
/* USER CODE BEGIN PFP */
@@ -115,78 +115,15 @@
float motor_keeptime;
void IdleTask(void)
{u16 current_time;
-
- UART_CheckReceive();
- UART_CheckSend();
-
if(huart1.Instance->ISR&USART_ISR_FE)
{
SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader
}
-//if(!HAL_GPIO_ReadPin(PWR_ON_GPIO_Port,PWR_ON_Pin))
-//{
-// LED_TR_ON;
-// LED_TB_OFF;
-//}else{
-// LED_TR_OFF;
- current_time=GetLPTime();
- //motor_state=2;
-// if(g_com_map[MOTOR_ONTIME]>0)
-// {
-// g_com_map[MOTOR_ONTIME]--;
-// motor_state = 1;
-// }
-if(0)//g_com_map[MOTOR_ENABLE])
-{
-
-
- switch(motor_state)
- {case 0:
- if(hardware_type==NSH1)
- {MOTOR_OFF;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
- }
- break;
- case 1:
- if(current_time<MOTOR_ONTIME)
- {
- if(hardware_type==NSH1)
- {MOTOR_ON;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
- }
- }else{
- if(hardware_type==NSH1)
- {MOTOR_OFF;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
- }
- }
- break;
- case 2:
- if(hardware_type==NSH1)
- {MOTOR_ON;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Start(&htim2, TIM_CHANNEL_3);
- }
- break;
- case 3:
- if(hardware_type==NSH1)
- {MOTOR_OFF;
- }else if(hardware_type==GP)
- {
- HAL_TIM_PWM_Stop(&htim2, TIM_CHANNEL_3);
- }
- break;
- }
-}
if(HAL_GPIO_ReadPin(INPUT_5V_GPIO_Port,INPUT_5V_Pin))
{
+
+ UART_CheckReceive();
+ UART_CheckSend();
nomove_count = 0;
// bat_percent=Get_Battary();
if(state5v==0)
@@ -313,9 +250,9 @@
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] = (1<<8)|36;
+ g_com_map[VERSION] = (1<<8)|43;
active_flag = g_com_map[ACTIVE_INDEX];
- module_power = g_com_map[POWER];
+ module_power = g_com_map[POWER];
imu_enable=g_com_map[IMU_ENABLE];
motor_enable=g_com_map[MOTOR_ENABLE];
@@ -341,6 +278,7 @@
// g_com_map[MAX_REPORT_ANC_NUM]=1;
// g_com_map[NOMOVESLEEP_TIME]=10;
#endif
+ // g_com_map[COM_INTERVAL]=100;
if(g_com_map[COM_INTERVAL]==0)
{
g_com_map[COM_INTERVAL]=100;
@@ -469,13 +407,12 @@
// HardWareTypeDiffConfig();
dwt_configuresleep(DWT_PRESRV_SLEEP | DWT_CONFIG, DWT_WAKE_CS | DWT_WAKE_WK| DWT_SLP_EN);
dwt_entersleep();
- waitusart_timer=tag_frequency*USART_KEEPWAKE_TIME;;
DW_DISABLE;
if(HAL_UART_Receive_DMA(&huart1,m_EUART_DMA_RXBuf,EUART_RX_BUF_SIZE))
{
Error_Handler();
}
-// HAL_Delay(2000);
+ HAL_Delay(2000);
// mcu_sleep();
//LED0_BLINK;
// SystemPower_Config();
@@ -598,7 +535,12 @@
* @param None
* @retval None
*/
-static void MX_ADC_Init(void)
+void MX_ADC_DeInit(void)
+{
+ HAL_ADC_DeInit(&hadc);
+ HAL_ADCEx_DisableVREFINT();
+}
+void MX_ADC_Init(void)
{
/* USER CODE BEGIN ADC_Init 0 */
@@ -635,14 +577,15 @@
}
/** Configure for the selected ADC regular channel to be converted.
*/
- sConfig.Channel = ADC_CHANNEL_1;
+ sConfig.Channel = ADC_CHANNEL_VREFINT;
sConfig.Rank = ADC_RANK_CHANNEL_NUMBER;
if (HAL_ADC_ConfigChannel(&hadc, &sConfig) != HAL_OK)
{
Error_Handler();
}
/* USER CODE BEGIN ADC_Init 2 */
-HAL_ADCEx_Calibration_Start(&hadc,ADC_SINGLE_ENDED);
+ HAL_ADCEx_EnableVREFINT();
+ HAL_ADCEx_Calibration_Start(&hadc,ADC_SINGLE_ENDED);
/* USER CODE END ADC_Init 2 */
}
--
Gitblit v1.9.3