chore: WIP: convert serial trainer to idle callback

EdgeTX · Sep 27, 2023 · 36ad3c1 · 36ad3c1
1 parent 28a6118
commit 36ad3c1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/radio/src/crsf.h b/radio/src/crsf.h
@@ -17,7 +17,7 @@ void crsfTrainerPauseCheck();
 
 namespace CRSF {
     static constexpr uint32_t baudrate{420000};
-
+    void crsfTrainerOnIdle();
     struct Servo {
         using Crsf = Trainer::Protocol::Crsf;
         using MesgType = Crsf::MesgType;

diff --git a/radio/src/serial.cpp b/radio/src/serial.cpp
@@ -219,11 +219,13 @@ static void serialSetCallBacks(int mode, void* ctx, const etx_serial_port_t* por
 #if defined(SBUS_TRAINER)
   case UART_MODE_SBUS_TRAINER:
   case UART_MODE_IBUS_TRAINER:
-  case UART_MODE_CRSF_TRAINER:
   case UART_MODE_SUMD_TRAINER:
     sbusSetAuxGetByte(ctx, getByte);
     // TODO: setRxCb (see MODE_LUA)
     break;
+  case UART_MODE_CRSF_TRAINER:
+	  if(port && && port->uart && port->uart->setIdleCb)
+		  port->uart->setIdleCb(ctx, CRSF::crsfTrainerOnIdle);
     break;
 #endif
 

diff --git a/radio/src/tasks/mixer_task.cpp b/radio/src/tasks/mixer_task.cpp
@@ -217,6 +217,8 @@ TASK_FUNCTION(mixerTask)
       DEBUG_TIMER_START(debugTimerMixer);
       mixerTaskLock();
 
+      processSerialTrainerInputs();
+
       doMixerCalculations();
       pulsesSendChannels();
       doMixerPeriodicUpdates();