From 178b3e001f2a4671f55da83133671223261d21f7 Mon Sep 17 00:00:00 2001
From: ThinkPad-T460P <ibookshiyi@gmail.com>
Date: Wed, 2 Sep 2020 18:45:43 +0800
Subject: [PATCH] update

---
 Core/Inc/navikit.h  |  2 +-
 Core/Src/freertos.c | 97 ++++++++++++++++++++++++++-------------------
 Core/Src/main.c     | 13 +-----
 Core/Src/navikit.c  |  2 +-
 4 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/Core/Inc/navikit.h b/Core/Inc/navikit.h
index db9328b..d7db43a 100644
--- a/Core/Inc/navikit.h
+++ b/Core/Inc/navikit.h
@@ -22,7 +22,7 @@ typedef struct
 	struct{
 		enum {
 			shutdown,	//only mcu runing
-			runing, 		//all function runing
+			running, 		//all function runing
 			sleep, 		//SOCs and FANs are stop
 			dfu,		//device firmware update for SOM
 			isp		//in system program for BIOS
diff --git a/Core/Src/freertos.c b/Core/Src/freertos.c
index d6c7b5f..afb4615 100644
--- a/Core/Src/freertos.c
+++ b/Core/Src/freertos.c
@@ -157,7 +157,7 @@ void MX_FREERTOS_Init(void) {
 
   /* Create the queue(s) */
   /* creation of uartQueue */
-  uartQueueHandle = osMessageQueueNew (128, sizeof(uint8_t), &uartQueue_attributes);
+  uartQueueHandle = osMessageQueueNew (1024, sizeof(uint8_t), &uartQueue_attributes);
 
   /* USER CODE BEGIN RTOS_QUEUES */
   /* add queues, ... */
@@ -207,24 +207,28 @@ void StartDefaultTask(void *argument)
   /* init code for USB_DEVICE */
   MX_USB_DEVICE_Init();
   /* USER CODE BEGIN StartDefaultTask */
-    uint8_t count,temp[256];
+
   HAL_GPIO_WritePin(USB2_FS_ENUM_CTL_GPIO_Port,USB2_FS_ENUM_CTL_Pin, GPIO_PIN_SET);
    Beep(50);
 
+   printf("\nCore initial successfully\n");
+   printf("---------------------------------------------\n");
+   printf("Copyright (c) Powered by www.autolabor.com.cn\n");
+   osDelay(100);
+   printf("BIOS SW Version: V0.9, build: %s, %s\n",__DATE__ ,__TIME__ );
+	  printf("HAL Version: %d \n", HAL_GetHalVersion());
+	  printf("Revision ID: %d \n", HAL_GetREVID());
+	  printf("Device ID: %d \n", HAL_GetDEVID());
+	   osDelay(100);
+	  printf("Chip UID: %d%d%d \n", HAL_GetUIDw0(),HAL_GetUIDw1(),HAL_GetUIDw2);
+	  printf("----------------------------------------------\n");
 
   /* Infinite loop */
   for(;;)
   {
 	osDelay(100);
-//  count = osMessageQueueGetCount(uartQueueHandle);
-//  if(count){
-//    for(uint8_t i=0;i<count;i++){
-//    osMessageQueueGet(uartQueueHandle,&temp[i],0,10);
-//    }
-//    HAL_UART_Transmit(&huart1,(uint8_t *)&temp,count,0xffff);
-//  }
-//  printf("test");
-//	 printf("Time:[%f s]; OUT_24:[%f V]; OUT_5:[%f V]; OUT_12:[%f V]; BKP_BAT:[%f V]; MAIN_PWR:[%f V]\n",(float)(osKernelGetTickCount()/1000.0),NaviKit.pmb.rails.out_24v,NaviKit.pmb.rails.out_5v,NaviKit.pmb.rails.out_12v,NaviKit.pmb.rails.bkp_bat,NaviKit.pmb.rails.main_pwr);
+
+	//  printf("Time:[%f s]; OUT_24:[%f V]; OUT_5:[%f V]; OUT_12:[%f V]; BKP_BAT:[%f V]; MAIN_PWR:[%f V]\n",(float)(osKernelGetTickCount()/1000.0),NaviKit.pmb.rails.out_24v,NaviKit.pmb.rails.out_5v,NaviKit.pmb.rails.out_12v,NaviKit.pmb.rails.bkp_bat,NaviKit.pmb.rails.main_pwr);
 
   }
   /* USER CODE END StartDefaultTask */
@@ -244,7 +248,7 @@ void StartLedBlinkTask(void *argument)
 	for(;;)
 	{
 		switch(NaviKit.sys.sta){
-		case runing:
+		case running:
     {
       if(HAL_GPIO_ReadPin(SYS_POWER_LED_CTL_GPIO_Port,SYS_POWER_LED_CTL_Pin))
         HAL_GPIO_WritePin(SYS_POWER_LED_CTL_GPIO_Port,SYS_POWER_LED_CTL_Pin,GPIO_PIN_RESET);//turn on power led
@@ -375,17 +379,17 @@ void StartEventDetect(void *argument)
 		  {//power btn has been pushed more than 1000 ms
 		// while(NaviKit.sys.power_btn == true);//wait to release button
 			  switch(NaviKit.sys.sta){
-				  case runing:{//system is runing now, user request to shutdown
+				  case running:{//system is running now, user request to shutdown
 					  NaviKit.sys.next_sta = shutdown;
 				  }break;
 				  case shutdown:{//system is shutdown now , user request to power on
-					  NaviKit.sys.next_sta = runing;
+					  NaviKit.sys.next_sta = running;
 				  }break;
 				  case dfu:{
 					  NaviKit.sys.next_sta = shutdown;
 				  }break;
 				  case sleep:{
-					  NaviKit.sys.next_sta = runing;
+					  NaviKit.sys.next_sta = running;
 				  }break;
 			  }
 		  }
@@ -447,7 +451,7 @@ void StartCoulombRead(void *argument)
   {
     coulomb_read_status_and_config();
     coulomb_read_status_raw_to_actual();
-	  if(NaviKit.sys.sta == runing)
+	  if(NaviKit.sys.sta == running)
 		  osDelay(500);
 	  else
 		  osDelay(5000);
@@ -474,17 +478,17 @@ void StartStateSwitchTask(void *argument)
 		  switch(NaviKit.sys.next_sta)
 		  {
 			  case shutdown:
-			  {//only from runing state
-          if(NaviKit.sys.sta == runing)
+			  {//only from running state
+          if(NaviKit.sys.sta == running)
             enter_shutdown_state();
           }break;
-			  case runing:
+			  case running:
 			  {//from sleep and shutdown state
           enter_runing_state();
           }break;
 			  case sleep:
-			  {//only form runing state
-          if(NaviKit.sys.sta == runing)
+			  {//only form running state
+          if(NaviKit.sys.sta == running)
             enter_sleep_state();
 
           }break;
@@ -525,20 +529,6 @@ void StartPowerMonitTask(void *argument)
   // printf("bkp_bat: %f \n",NaviKit.pmb.bkp_bat_div8);
   // printf("main_pwr: %f \n",NaviKit.pmb.main_pwr_div16);
 
-
-
-
-    //    //module request to stop
-    //    if(HAL_GPIO_ReadPin(SOM_SHUTDOWN_REQ_GPIO_Port,SOM_SHUTDOWN_REQ_Pin) == GPIO_PIN_SET)
-    //    {
-    //      //1.the last step of normal power off process
-    //      //2.Thermal shutdown
-    //      //3.vdd_in's wave more than 5% of 5.0V
-    //
-    //
-    //      HAL_GPIO_WritePin(SOM_POWER_EN_GPIO_Port,SOM_POWER_EN_Pin,GPIO_PIN_RESET);
-    //    }
-
   }
   /* USER CODE END StartPowerMonitTask */
 }
@@ -553,10 +543,26 @@ void StartPowerMonitTask(void *argument)
 void StartUartQueueTask(void *argument)
 {
   /* USER CODE BEGIN StartUartQueueTask */
+    uint8_t count,temp[256];
+//  osMessageQueuePut(uartQueueHandle,"t",0,100);
+//  osMessageQueuePut(uartQueueHandle,"e",0,100);
+//  osMessageQueuePut(uartQueueHandle,"s",0,100);
+//  osMessageQueuePut(uartQueueHandle,"t",0,100);
+
   /* Infinite loop */
   for(;;)
   {
     osDelay(1);
+      count = osMessageQueueGetCount(uartQueueHandle);
+      if(count){
+        for(uint8_t i=0;i<count;i++){
+        	osMessageQueueGet(uartQueueHandle,&temp[i],0,10);
+        }
+//        taskENTER_CRITICAL();
+		while(HAL_UART_GetState(&huart1) == HAL_UART_STATE_BUSY_TX){}
+        HAL_UART_Transmit(&huart1,(uint8_t *)&temp,count,0xffff);
+//        taskEXIT_CRITICAL();
+      }
   }
   /* USER CODE END StartUartQueueTask */
 }
@@ -565,20 +571,31 @@ void StartUartQueueTask(void *argument)
 /* USER CODE BEGIN Application */
 
 
-
 //printf redefine
 #ifdef __GNUC__
 #define PUTCHAR_PROTOTYPE int __io_putchar(int ch)
+#else
+#define PUTCHAR_PROTOTYPE int fputc(int ch, FILE *f)
+#endif
+
 PUTCHAR_PROTOTYPE
 {
 
-	while(HAL_UART_GetState(&huart1) == HAL_UART_STATE_BUSY_TX){}
-	HAL_UART_Transmit(&huart1,(uint8_t *)&ch,1,0xffff);
+//	while(HAL_UART_GetState(&huart1) == HAL_UART_STATE_BUSY_TX){}
+//	HAL_UART_Transmit(&huart1,(uint8_t *)&ch,1,0xffff);
 
-//  osMessageQueuePut(uartQueueHandle,(uint8_t *)&ch,0,100);
+	//queue space check before enqueue
+	if(osMessageQueueGetSpace(uartQueueHandle)>0){
+		osMessageQueuePut(uartQueueHandle,(uint8_t*)&ch,0,100);
+	}
+	else{
+//		uint8_t front[1];//trash
+//    	osMessageQueueGet(uartQueueHandle,front,0,10);
+//		osMessageQueuePut(uartQueueHandle,(uint8_t *)&ch,0,100);
+	}
   return ch;
 }
-#endif
+
 /* USER CODE END Application */
 
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/Core/Src/main.c b/Core/Src/main.c
index abb2884..6199d03 100644
--- a/Core/Src/main.c
+++ b/Core/Src/main.c
@@ -108,16 +108,7 @@ int main(void)
   /* Initialize interrupts */
   MX_NVIC_Init();
   /* USER CODE BEGIN 2 */
-  //HAL_IWDG_Refresh(&hiwdg);
-  printf("\nCore initial successfully\n");
-  printf("---------------------------------------------\n");
-  printf("Copyright (c) Powered by www.autolabor.com.cn\n");
-  printf("BIOS SW Version: V0.9, build: %s %s\n",__DATE__ ,__TIME__ );
-  printf("HAL Version: %d \n", HAL_GetHalVersion());
-  printf("Revision ID: %d \n", HAL_GetREVID());
-  printf("Device ID: %d \n", HAL_GetDEVID());
-  printf("Chip UID: %d%d%d \n", HAL_GetUIDw0(),HAL_GetUIDw1(),HAL_GetUIDw2);
-  printf("----------------------------------------------\n");
+
   /* USER CODE END 2 */
 
   /* Init scheduler */
@@ -231,7 +222,7 @@ static void MX_NVIC_Init(void)
 
 /* USER CODE BEGIN 4 */
 void ISP_Judge()
-{
+{//Judge that if need jump to ISP area
 	RTC_HandleTypeDef hrtc;
 	hrtc.Instance = RTC;
 	if(HAL_RTCEx_BKUPRead(&hrtc,RTC_BKP_DR1) == 0x32f2)
diff --git a/Core/Src/navikit.c b/Core/Src/navikit.c
index b34fda0..0dfb15b 100644
--- a/Core/Src/navikit.c
+++ b/Core/Src/navikit.c
@@ -60,7 +60,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
 		if(HAL_GPIO_ReadPin(SOM_SHUTDOWN_REQ_GPIO_Port, SOM_SHUTDOWN_REQ_Pin)==GPIO_PIN_RESET)
 		{//falling edge trigger
 //			NaviKit.som.shutdown_req = false;
-			  if(NaviKit.sys.sta == runing)
+			  if(NaviKit.sys.sta == running)
 			  {
 				  NaviKit.sys.next_sta = shutdown;
 			  }