Merge pull request #8406 from iNavFlight/MrD_disable-stick-commands-i…

…f-connected-to-configurator

Disable stick commands if in CLI

src/main/fc/rc_controls.c

@@ -37,6 +37,7 @@
 
 #include "drivers/time.h"
 
+#include "fc/cli.h"
 #include "fc/config.h"
 #include "fc/controlrate_profile.h"
 #include "fc/fc_core.h"
@@ -251,7 +252,12 @@ void processRcStickPositions(throttleStatus_e throttleStatus)
         return;
     }
 
-    // actions during not armed
+    // Disable stick commands when in CLI mode. Ideally, they should also be disabled when configurator is connected
+    if (cliMode) {
+        return;
+    }
+
+    // actions during not armed and not in CLI
 
     // GYRO calibration
     if (rcSticks == THR_LO + YAW_LO + PIT_LO + ROL_CE) {

src/main/io/osd.c

@@ -4528,6 +4528,7 @@ textAttributes_t osdGetSystemMessage(char *buff, size_t buff_size, bool isCenter
         }
 
         /* Messages that are shown regardless of Arming state */
+
 #ifdef USE_DEV_TOOLS
         if (systemConfig()->groundTestMode) {
             messages[messageCount++] = OSD_MESSAGE_STR(OSD_MSG_GRD_TEST_MODE);