Wakeup and Standby systems

Core/Src/freertos.c

@@ -36,6 +36,7 @@
 #include "BSP_INA.h"
 #include "BSP_POWER.h"
 #include "LightTask.h"
+#include "BSP_GPIO.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -65,12 +66,20 @@ const osThreadAttr_t defaultTask_attributes = {
   .priority = (osPriority_t) osPriorityNormal,
 };
 
+osThreadId_t waitForStartConfirmHandle;
+const osThreadAttr_t waitForStartConfirm_attributes = {
+  .name = "waitForStartConfirm",
+  .stack_size = 128 * 4,
+  .priority = (osPriority_t) osPriorityNormal,
+};
+
 /* Private function prototypes -----------------------------------------------*/
 /* USER CODE BEGIN FunctionPrototypes */
 
 /* USER CODE END FunctionPrototypes */
 
 void StartDefaultTask(void *argument);
+void WaitForStartConfirm_Task(void *argument);
 
 extern void MX_USB_DEVICE_Init(void);
 void MX_FREERTOS_Init(void); /* (MISRA C 2004 rule 8.1) */
@@ -99,7 +108,6 @@ return __HAL_TIM_GetCounter(&htim2);
   */
 void MX_FREERTOS_Init(void) {
   /* USER CODE BEGIN Init */
-  BSP_POWER_Init();
   /* USER CODE END Init */
 
   /* USER CODE BEGIN RTOS_MUTEX */
@@ -123,6 +131,9 @@ void MX_FREERTOS_Init(void) {
   defaultTaskHandle = osThreadNew(StartDefaultTask, NULL, &defaultTask_attributes);
 
   /* USER CODE BEGIN RTOS_THREADS */
+
+  waitForStartConfirmHandle = osThreadNew(WaitForStartConfirm_Task, NULL, &waitForStartConfirm_attributes);
+
   ULOG_INFO("Setup UsbDataHandler");
   UsbDataHandler_Start();
   ULOG_INFO("Setup CanDataTask");
@@ -200,5 +211,34 @@ void StartDefaultTask(void *argument)
 /* Private application code --------------------------------------------------*/
 /* USER CODE BEGIN Application */
 
+void WaitForStartConfirm_Task(void *argument) {
+
+  // wait for up to 1 s and check if either K15 is set or we got a Car CAN message
+  // once one of these is true, we can start the power systems.
+  // after waiting for 1s, the system should shutdown / go to standby mode
+  uint32_t tick = osKernelGetTickCount();
+  uint32_t delayTime = 50; // Set the initial delay time to 50ms
+  uint32_t maxDelayTime = 1000; // Set the maximum delay time to 1000ms
+
+  while(1) {
+    osDelayUntil(tick);
+    tick += delayTime;
+    if(BSP_GPIO_K15isSet() || CanDataTask_gotCarCanMessage()) {
+        BSP_GPIO_ClsOn();
+        BSP_GPIO_RadioOn();
+        ULOG_INFO("Power systems started");
+        osThreadExit();
+        return;
+    }
+
+    if(tick > maxDelayTime) {
+        BSP_POWER_EnterStandby();
+        ULOG_INFO("System in standby mode");
+        osThreadExit();
+        return;
+    }
+  }
+}
+
 /* USER CODE END Application */
 

Core/Src/main.c

@@ -38,6 +38,8 @@
 /* USER CODE BEGIN Includes */
 #include "ulog.h"
 #include "stdio.h"
+#include "BSP_POWER.h"
+#include "BSP_GPIO.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -81,7 +83,7 @@ void ULOG_SendLPUART(ulog_level_t level, char *msg);
   * @retval int
   */
 int main(void)
-{
+  {
   /* USER CODE BEGIN 1 */
 
   /* USER CODE END 1 */
@@ -108,7 +110,7 @@ int main(void)
   PeriphCommonClock_Config();
 
   /* USER CODE BEGIN SysInit */
-
+  BSP_POWER_WakeUp();
   /* USER CODE END SysInit */
 
   /* Initialize all configured peripherals */
@@ -129,40 +131,18 @@ int main(void)
   MX_TIM2_Init();
   MX_LPTIM4_Init();
   /* USER CODE BEGIN 2 */
-    ULOG_INIT();
-  ULOG_SUBSCRIBE(ULOG_SendLPUART,ULOG_DEBUG_LEVEL);
-  GPIO_PinState K15 = HAL_GPIO_ReadPin(K15_Detect_GPIO_Port, K15_Detect_Pin);
-  while (K15 == GPIO_PIN_RESET)
-  {
-     K15 = HAL_GPIO_ReadPin(K15_Detect_GPIO_Port, K15_Detect_Pin);
-    ULOG_DEBUG("Wait for K15 Signal Wait Wait Wait");
-    HAL_Delay(100);
-  }
   
-
-  GPIO_PinState HL = HAL_GPIO_ReadPin(Headlight_Detect_GPIO_Port, Headlight_Detect_Pin);
-  while (HL == GPIO_PIN_RESET)
-  {
-     HL = HAL_GPIO_ReadPin(Headlight_Detect_GPIO_Port, Headlight_Detect_Pin);
-    ULOG_DEBUG("Wait for K15 Signal Wait Wait Wait");
-    HAL_Delay(100);
-  }
-
+  BSP_GPIO_PeriperalsOn();
+  BSP_POWER_Init();
+  ULOG_INIT();
+  ULOG_SUBSCRIBE(ULOG_SendLPUART,ULOG_DEBUG_LEVEL);
   ULOG_DEBUG("Setup Logger");
-  HAL_GPIO_WritePin(Periph_Power_GPIO_Port,Periph_Power_Pin,GPIO_PIN_RESET);
-  HAL_GPIO_WritePin(CLS_POWER_GPIO_Port, CLS_POWER_Pin, GPIO_PIN_SET);
-  ULOG_DEBUG("Enable Power on CLS and Periph");
-  gCLS_DEVICE_ADDRESS = 0x11;
+  gCLS_DEVICE_ADDRESS = 0x11; // Address is set to master
   ULOG_DEBUG("Setting Global CLS address to 0b10001");
   ULOG_DEBUG("Init Kernel and start schedule");
-  
-  
-
 
   /* USER CODE END 2 */
 
-
-
   /* Init scheduler */
   osKernelInitialize();  /* Call init function for freertos objects (in freertos.c) */
   MX_FREERTOS_Init();
@@ -364,6 +344,13 @@ void Error_Handler(void)
 {
   /* USER CODE BEGIN Error_Handler_Debug */
   /* User can add his own implementation to report the HAL error return state */
+
+  ULOG_ERROR("Error Handler");
+  osThreadId_t error_thread = osThreadGetId();
+  if(error_thread != NULL) {
+   const char * osThreadGetName(error_thread);
+    ULOG_ERROR("Error in thread: %s", osThreadGetName(error_thread));
+  }
   __disable_irq();
   while (1)
   {