Moved drawSplash() into UI task and fixed task prios

radio/src/opentx.cpp

@@ -1950,12 +1950,6 @@ int main()
   stackPaint();
 #endif
 
-#if defined(SPLASH) && !defined(STARTUP_ANIMATION)
-  if (!UNEXPECTED_SHUTDOWN()) {
-    drawSplash();
-  }
-#endif
-
 #if defined(PCBHORUS)
   if (!IS_FIRMWARE_COMPATIBLE_WITH_BOARD()) {
     runFatalErrorScreen(STR_WRONG_PCBREV);

radio/src/rtos.h

@@ -45,10 +45,6 @@ extern "C++" {
   extern uint64_t simuTimerMicros(void);
   extern uint8_t simuSleep(uint32_t ms);
 
-  static inline void RTOS_INIT()
-  {
-  }
-
   static inline void RTOS_START()
   {
   }
@@ -184,19 +180,8 @@ template<int SIZE>
     StaticSemaphore_t mutex_struct;
   } RTOS_MUTEX_HANDLE;
   
-  // typedef TaskHandle_t       RTOS_TASK_HANDLE;
-  // typedef SemaphoreHandle_t  RTOS_MUTEX_HANDLE;
-
   typedef RTOS_MUTEX_HANDLE RTOS_FLAG_HANDLE;
   
-  //typedef OS_FlagID  RTOS_FLAG_HANDLE;
-  //typedef OS_EventID RTOS_EVENT_HANDLE;
-
-  static inline void RTOS_INIT()
-  {
-    //CoInitOS();
-  }
-
   static inline void RTOS_START()
   {
     vTaskStartScheduler();

radio/src/tasks.cpp

@@ -243,6 +243,13 @@ bool perMainEnabled = true;
 
 TASK_FUNCTION(menusTask)
 {
+#if defined(SPLASH) && !defined(STARTUP_ANIMATION)
+  if (!UNEXPECTED_SHUTDOWN()) {
+    drawSplash();
+    TRACE("drawSplash() completed");
+  }
+#endif
+
   opentxInit();
 
 #if defined(PWR_BUTTON_PRESS)
@@ -296,8 +303,6 @@ TASK_FUNCTION(menusTask)
 
 void tasksStart()
 {
-  RTOS_INIT();
-
   RTOS_CREATE_MUTEX(audioMutex);
   RTOS_CREATE_MUTEX(mixerMutex);
 

radio/src/tasks.h

@@ -33,10 +33,10 @@
 #define AUDIO_STACK_SIZE       400
 #define CLI_STACK_SIZE         1000  // only consumed with CLI build option
 
-#define MIXER_TASK_PRIO        5
-#define AUDIO_TASK_PRIO        7
-#define MENUS_TASK_PRIO        10
-#define CLI_TASK_PRIO          10
+#define MIXER_TASK_PRIO        (tskIDLE_PRIORITY + 4)
+#define AUDIO_TASK_PRIO        (tskIDLE_PRIORITY + 2)
+#define MENUS_TASK_PRIO        (tskIDLE_PRIORITY + 1)
+#define CLI_TASK_PRIO          (tskIDLE_PRIORITY + 1)
 
 extern RTOS_TASK_HANDLE menusTaskId;
 extern RTOS_DEFINE_STACK(menusStack, MENUS_STACK_SIZE);