AP_RCProtocol: correct compilation when crossfire not compiled in

ArduPilot · Feb 12, 2024 · aaad98e · aaad98e
1 parent 74e742f
commit aaad98e
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_GHST.cpp b/libraries/AP_RCProtocol/AP_RCProtocol_GHST.cpp
@@ -435,10 +435,15 @@ void AP_RCProtocol_GHST::process_handshake(uint32_t baudrate)
         || baudrate != CRSF_BAUDRATE
         || baudrate == GHST_BAUDRATE
         || uart->get_baud_rate() == GHST_BAUDRATE
-        || !protocol_enabled(AP_RCProtocol::GHST)
-        || protocol_enabled(AP_RCProtocol::CRSF)) {
+        || !protocol_enabled(AP_RCProtocol::GHST)) {
         return;
     }
+#if AP_RCPROTOCOL_CRSF_ENABLED
+    if (protocol_enabled(AP_RCProtocol::CRSF)) {
+        // don't fight CRSF
+        return;
+    }
+#endif
 
     uart->begin(GHST_BAUDRATE);
 }