From b181cd0402de3a02f88069981e8277c6d734647e Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 28 一月 2021 17:50:55 +0800
Subject: [PATCH] V2.21 修复下发震动BUG

---
 Src/main.c |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Src/main.c b/Src/main.c
index 10eba42..466e2ed 100644
--- a/Src/main.c
+++ b/Src/main.c
@@ -132,6 +132,7 @@
 	//motor_state=2;
 if(g_com_map[MOTOR_ENABLE])
 {
+    
 		if(motor_keeptime>0)
 		{
 			motor_state = 2;
@@ -297,7 +298,7 @@
 	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] = 0x0213;
+	g_com_map[VERSION] = 0x0214;
 //	g_com_map[DEV_ID]=0x11;
 #ifdef DEBUG_MODE
 //	g_com_map[DEV_ROLE]=1;
@@ -388,7 +389,7 @@
 			break;
 		case 2:
 			MX_TIM2_Init();
-		BarInit();
+		//BarInit();
 			break;
 		}
 }
@@ -427,10 +428,10 @@
   /* 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;
@@ -469,7 +470,7 @@
 	{ static uint16_t blink_count=0;
 		SystemClock_Config();
 		g_start_send_flag = 0;	
-		GetPressAndTemp();
+	//	GetPressAndTemp();
 //		if(current_count>slot_startcount&&current_count<slot_startcount+interval_count)
 //		{
 //		HAL_GPIO_WritePin(LED0_GPIO, GPIO_PIN_9, GPIO_PIN_SET);
@@ -956,6 +957,8 @@
 	{	
 	motor_keeptime-=(float)g_com_map[COM_INTERVAL]/1000;
 	}
+    if(motor_keeptime<0)
+    {motor_keeptime = 0;}
 	if(active_flag==0)
 	{
 	if(!GET_USERKEY)
@@ -1001,7 +1004,7 @@
 	}else{
 		key_keeptime=0;
 	}
-	if(nomove_count>STATIONARY_TIME)
+	if(nomove_count>g_com_map[STATIONARY_TIME])
 	{
 		stationary_flag = 1;
 	}else{
@@ -1028,12 +1031,12 @@
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
-  while (1)
-  {
-    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
-		SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
-    /* USER CODE END W1_HardFault_IRQn 0 */
-  }
+//  while (1)
+//  {
+//    /* USER CODE BEGIN W1_HardFault_IRQn 0 */
+//		//SCB->AIRCR = 0X05FA0000|(unsigned int)0x04;
+//    /* USER CODE END W1_HardFault_IRQn 0 */
+//  }
   /* USER CODE END Error_Handler_Debug */
 }
 

--
Gitblit v1.9.3