Make stacks bigger to match usage

This fix a crash in the GUI thread as it's stack was to low.
This will also start printing the stack usage in the 5min-update.

Signed-off-by: Zingo Andersen <zingo@zingo.org>

Author: zingo

include/common.h

@@ -21,6 +21,20 @@ extern ESP32Time rtc;
 extern uint32_t raceStartIn;
 extern bool raceOngoing;
 
+#define TASK_BT_PRIO 20
+#define TASK_RACEDB_PRIO 10
+#define TASK_GUI_PRIO 5
+
+// Stack size in words, not bytes.
+#define TASK_BT_STACK (4*1024)
+#define TASK_RACEDB_STACK (8*1024)
+#define TASK_GUI_STACK (32*1024)
+
+
+extern TaskHandle_t xHandleBT;
+extern TaskHandle_t xHandleRaceDB;
+extern TaskHandle_t xHandleGUI;
+
 // Broadcast...() - Don't touch data, just send messages, can be used from any context
 void BroadcastRaceClear();
 void BroadcastRaceStart(time_t raceStartTime);

src/bluetooth.cpp

@@ -206,7 +206,7 @@ static void vTaskBTConnect( void *pvParameters )
   /* The parameter value is expected to be 1 as 1 is passed in the
      pvParameters value in the call to xTaskCreate() below. 
   */
-  configASSERT( ( ( uint32_t ) pvParameters ) == 1 );
+  //configASSERT( ( ( uint32_t ) pvParameters ) == 1 );
 
   BLEScan* pBLEScan;
   ESP_LOGI(TAG,"BLEDevice init");
@@ -284,15 +284,14 @@ void initBluetooth()
 {
   // Start BT Task (scan and inital connect&config)
   BaseType_t xReturned;
-  TaskHandle_t xHandle = NULL;
   /* Create the task, storing the handle. */
   xReturned = xTaskCreate(
                   vTaskBTConnect,       /* Function that implements the task. */
                   "BTConnect",          /* Text name for the task. */
-                  4096,                 /* Stack size in words, not bytes. */
-                  ( void * ) 1,         /* Parameter passed into the task. */
-                  20,                   /* Priority  0-(configMAX_PRIORITIES-1)   idle = 0 = tskIDLE_PRIORITY*/
-                  &xHandle );           /* Used to pass out the created task's handle. */
+                  TASK_BT_STACK,        /* Stack size in words, not bytes. */
+                  NULL,                 /* Parameter passed into the task. */
+                  TASK_BT_PRIO,         /* Priority  0-(configMAX_PRIORITIES-1)   idle = 0 = tskIDLE_PRIORITY*/
+                  &xHandleBT );         /* Used to pass out the created task's handle. */
 
   if( xReturned != pdPASS )
   {

src/gui.cpp

@@ -273,7 +273,7 @@ static void taEdit_event_cb(lv_event_t * e)
 
   // Name updated -> send update signal to RaceDB, and update signal will be send back
   // that will resync name in all tabs.
-  if(code == LV_EVENT_READY || code == LV_EVENT_DEFOCUSED)
+  if(code == LV_EVENT_READY || code == LV_EVENT_DEFOCUSED || code == LV_EVENT_CANCEL)
   {
     uint32_t color0 = lv_color_to32(lv_obj_get_style_bg_color(guiParticipants[handleGFX].ledColor0, LV_PART_MAIN));
     uint32_t color1 = lv_color_to32(lv_obj_get_style_bg_color(guiParticipants[handleGFX].ledColor1, LV_PART_MAIN));
@@ -1513,7 +1513,7 @@ void vTaskLVGL( void *pvParameters )
   /* The parameter value is expected to be 2 as 2 is passed in the
      pvParameters value in the call to xTaskCreate() below. 
   */
-  configASSERT( ( ( uint32_t ) pvParameters ) == 2 );
+  //configASSERT( ( ( uint32_t ) pvParameters ) == 2 );
 
   ESP_LOGI(TAG, "Setup GFX");
   gfx->begin();
@@ -1594,15 +1594,15 @@ void initLVGL()
 {
   // Start LVGL Task
   BaseType_t xReturned;
-  TaskHandle_t xHandle = NULL;
+  
   /* Create the task, storing the handle. */
   xReturned = xTaskCreate(
                   vTaskLVGL,         /* Function that implements the task. */
                   "GUI",             /* Text name for the task. */
-                  4096,              /* Stack size in words, not bytes. */
-                  ( void * ) 2,      /* Parameter passed into the task. */
-                  5,                 /* Priority  0-(configMAX_PRIORITIES-1)   idle = 0 = tskIDLE_PRIORITY*/
-                  &xHandle );        /* Used to pass out the created task's handle. */
+                  TASK_GUI_STACK,    /* Stack size in words, not bytes. */
+                  NULL,              /* Parameter passed into the task. */
+                  TASK_GUI_PRIO,     /* Priority  0-(configMAX_PRIORITIES-1)   idle = 0 = tskIDLE_PRIORITY*/
+                  &xHandleGUI );     /* Used to pass out the created task's handle. */
 
   if( xReturned != pdPASS )
   {

src/iTag.cpp

@@ -869,7 +869,7 @@ void vTaskRaceDB( void *pvParameters )
   /* The parameter value is expected to be 2 as 2 is passed in the
      pvParameters value in the call to xTaskCreate() below. 
   */
-  configASSERT( ( ( uint32_t ) pvParameters ) == 2 );
+  //configASSERT( ( ( uint32_t ) pvParameters ) == 2 );
 
   // Add all Participants in race to race page
   for(int handleDB=0; handleDB<ITAG_COUNT; handleDB++)
@@ -1006,8 +1006,8 @@ void vTaskRaceDB( void *pvParameters )
         }
         case MSG_ITAG_UPDATE_USER:
         {
-          //ESP_LOGI(TAG,"Received: MSG_ITAG_UPDATE_USER MSG:0x%x handleDB:0x%08x handleGFX:0x%08x inRace:%d ? myinRace:%d", 
-          //     msg.UpdateParticipantRaceStatus.header.msgType, msg.UpdateParticipantRaceStatus.handleDB, msg.UpdateParticipantRaceStatus.handleGFX, msg.UpdateParticipantRaceStatus.inRace,iTags[handleDB].participant.getInRace());
+          ESP_LOGI(TAG,"Received: MSG_ITAG_UPDATE_USER MSG:0x%x handleDB:0x%08x handleGFX:0x%08x inRace:%d", 
+               msg.UpdateParticipantRaceStatus.header.msgType, msg.UpdateParticipantRaceStatus.handleDB, msg.UpdateParticipantRaceStatus.handleGFX, msg.UpdateParticipantRaceStatus.inRace);
 
           uint32_t handleDB = msg.UpdateParticipant.handleDB;
           iTags[handleDB].participant.setHandleGFX(msg.UpdateParticipant.handleGFX, true);
@@ -1156,15 +1156,14 @@ void initRaceDB()
 {
   // Start iTag Task
   BaseType_t xReturned;
-  TaskHandle_t xHandle = NULL;
   /* Create the task, storing the handle. */
   xReturned = xTaskCreate(
                   vTaskRaceDB,       /* Function that implements the task. */
                   "RaceDB",          /* Text name for the task. */
-                  4096,              /* Stack size in words, not bytes. */
-                  ( void * ) 2,      /* Parameter passed into the task. */
-                  5,                 /* Priority  0-(configMAX_PRIORITIES-1)   idle = 0 = tskIDLE_PRIORITY*/
-                  &xHandle );       /* Used to pass out the created task's handle. */
+                  TASK_RACEDB_STACK, /* Stack size in words, not bytes. */
+                  NULL,              /* Parameter passed into the task. */
+                  TASK_RACEDB_PRIO,  /* Priority  0-(configMAX_PRIORITIES-1)   idle = 0 = tskIDLE_PRIORITY*/
+                  &xHandleRaceDB );  /* Used to pass out the created task's handle. */
 
   if( xReturned != pdPASS )
   {

src/main.cpp

@@ -37,9 +37,14 @@ uint32_t raceStartIn = 0;
 bool raceOngoing = false;
 
 
-QueueHandle_t queueRaceDB;
-QueueHandle_t queueBTConnect;
-QueueHandle_t queueGFX; 
+QueueHandle_t queueBTConnect = NULL;
+QueueHandle_t queueRaceDB = NULL;
+QueueHandle_t queueGFX = NULL; 
+
+TaskHandle_t xHandleBT = NULL;
+TaskHandle_t xHandleRaceDB = NULL;
+TaskHandle_t xHandleGUI = NULL;
+
 
 void initMessageQueues()
 {
@@ -192,5 +197,13 @@ void loop()
   if ((lastTimeUpdate+5*60) <= now) { //one per 5 min
     lastTimeUpdate = now;
     showHeapInfo(); //Monitor heap to see if memory leaks
+    ESP_LOGI(TAG,"Main   used stack: %d",uxTaskGetStackHighWaterMark(nullptr));
+    ESP_LOGI(TAG,"BT     used stack: %d / %d",uxTaskGetStackHighWaterMark(xHandleBT),TASK_BT_STACK);
+//#if NIMBLE_CFG_CONTROLLER
+//    ESP_LOGI(TAG,"BT ll  used stack: %d",nimble_port_freertos_get_ll_hwm());
+//#endif
+//    ESP_LOGI(TAG,"BT hs  used stack: %d",nimble_port_freertos_get_hs_hwm());
+    ESP_LOGI(TAG,"RaceDB used stack: %d / %d",uxTaskGetStackHighWaterMark(xHandleRaceDB),TASK_RACEDB_STACK);
+    ESP_LOGI(TAG,"GUI    used stack: %d / %d",uxTaskGetStackHighWaterMark(xHandleGUI),TASK_GUI_STACK);
   }
 }