chore: trainerInputValidityTimer has moved

EdgeTX · Aug 22, 2024 · 812f0e0 · 812f0e0
1 parent 17d3eec
commit 812f0e0
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/radio/src/edgetx.cpp b/radio/src/edgetx.cpp
@@ -1656,16 +1656,14 @@ bool pwrOffDueToInactivity()
 
   tmr10ms_t currentTime = get_tmr10ms();
 
-  if (
-    TELEMETRY_STREAMING() ||
-    (usbPlugged() && getSelectedUsbMode() != USB_UNSELECTED_MODE) ||
-    trainerInputValidityTimer != 0 // previously IS_TRAINER_INPUT_VALID()
-  )
+  if (TELEMETRY_STREAMING() ||
+      (usbPlugged() && getSelectedUsbMode() != USB_UNSELECTED_MODE) ||
+      isTrainerValid())
     lastConnectedTime = currentTime;
 
-  bool inactivityShutdown = inactivityLimit &&
-    inactivity.counter > 60u*inactivityLimit &&
-    (currentTime-lastConnectedTime)/100u > 60u*inactivityLimit;
+  bool inactivityShutdown =
+      inactivityLimit && inactivity.counter > 60u * inactivityLimit &&
+      (currentTime - lastConnectedTime) / 100u > 60u * inactivityLimit;
 
   return inactivityShutdown;
 }