Rover: correct compilation with AP_RRSI_ENABLED false

Co-authored-by: David Buzz <[email protected]>
xianglunkai · Jul 23, 2024 · 3def5f7 · 3def5f7
1 parent 3e54ecf
commit 3def5f7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/Rover/GCS_Mavlink.cpp b/Rover/GCS_Mavlink.cpp
@@ -142,7 +142,12 @@ void GCS_MAVLINK_Rover::send_servo_out()
         0,
         0,
         0,
-        receiver_rssi());
+#if AP_RSSI_ENABLED
+        receiver_rssi()
+#else
+        255
+#endif
+        );
 }
 
 int16_t GCS_MAVLINK_Rover::vfr_hud_throttle() const

diff --git a/Rover/Log.cpp b/Rover/Log.cpp
@@ -237,9 +237,11 @@ void Rover::Log_Write_RC(void)
 {
     logger.Write_RCIN();
     logger.Write_RCOUT();
+#if AP_RSSI_ENABLED
     if (rssi.enabled()) {
         logger.Write_RSSI();
     }
+#endif
 }
 
 void Rover::Log_Write_Vehicle_Startup_Messages()

diff --git a/Rover/Parameters.cpp b/Rover/Parameters.cpp
@@ -358,9 +358,11 @@ const AP_Param::Info Rover::var_info[] = {
     // @Path: ../libraries/AP_Mission/AP_Mission.cpp
     GOBJECTN(mode_auto.mission, mission, "MIS_", AP_Mission),
 
+#if AP_RSSI_ENABLED
     // @Group: RSSI_
     // @Path: ../libraries/AP_RSSI/AP_RSSI.cpp
     GOBJECT(rssi, "RSSI_",  AP_RSSI),
+#endif
 
     // @Group: NTF_
     // @Path: ../libraries/AP_Notify/AP_Notify.cpp

diff --git a/Rover/system.cpp b/Rover/system.cpp
@@ -18,7 +18,9 @@ void Rover::init_ardupilot()
     rpm_sensor.init();
 #endif
 
+#if AP_RSSI_ENABLED
     rssi.init();
+#endif
 
     g2.windvane.init(serial_manager);