Plane: add system ID to quadplane

bnsgeyer · Jan 29, 2025 · d2b4a6f · d2b4a6f
1 parent 684cebd
commit d2b4a6f
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 2 deletions.
diff --git a/ArduPlane/GCS_MAVLink_Plane.cpp b/ArduPlane/GCS_MAVLink_Plane.cpp
@@ -41,6 +41,7 @@ MAV_MODE GCS_MAVLINK_Plane::base_mode() const
     case Mode::Number::FLY_BY_WIRE_B:
 #if HAL_QUADPLANE_ENABLED
     case Mode::Number::QSTABILIZE:
+    case Mode::Number::QSYSTEMID:
     case Mode::Number::QHOVER:
     case Mode::Number::QLOITER:
     case Mode::Number::QLAND:
@@ -1606,6 +1607,7 @@ uint8_t GCS_MAVLINK_Plane::send_available_mode(uint8_t index) const
     // Quadplane modes
     const Mode* q_modes[] {
         &plane.mode_qstabilize,
+        &plane.mode_qsystemid,
         &plane.mode_qhover,
         &plane.mode_qloiter,
         &plane.mode_qland,

diff --git a/ArduPlane/GCS_Plane.cpp b/ArduPlane/GCS_Plane.cpp
@@ -43,6 +43,7 @@ void GCS_Plane::update_vehicle_sensor_status_flags(void)
     case Mode::Number::AUTOTUNE:
 #if HAL_QUADPLANE_ENABLED
     case Mode::Number::QSTABILIZE:
+    case Mode::Number::QSYSTEMID:
     case Mode::Number::QHOVER:
     case Mode::Number::QLAND:
     case Mode::Number::QLOITER:

diff --git a/ArduPlane/events.cpp b/ArduPlane/events.cpp
@@ -49,6 +49,7 @@ void Plane::failsafe_short_on_event(enum failsafe_state fstype, ModeReason reaso
 
 #if HAL_QUADPLANE_ENABLED
     case Mode::Number::QSTABILIZE:
+    case Mode::Number::QSYSTEMID:
     case Mode::Number::QLOITER:
     case Mode::Number::QHOVER:
 #if QAUTOTUNE_ENABLED
@@ -162,6 +163,7 @@ void Plane::failsafe_long_on_event(enum failsafe_state fstype, ModeReason reason
 
 #if HAL_QUADPLANE_ENABLED
     case Mode::Number::QSTABILIZE:
+    case Mode::Number::QSYSTEMID:
     case Mode::Number::QHOVER:
     case Mode::Number::QLOITER:
     case Mode::Number::QACRO:

diff --git a/ArduPlane/mode.h b/ArduPlane/mode.h
@@ -721,7 +721,7 @@ class ModeQSystemId : public Mode {
     bool allows_throttle_nudging() const override { return true; }
 
     // methods that affect movement of the vehicle in this mode
-//    void update() override;
+    void update() override;
 
     // used as a base class for all Q modes
     bool _enter() override;

diff --git a/ArduPlane/mode_qsystemid.cpp b/ArduPlane/mode_qsystemid.cpp
@@ -115,7 +115,7 @@ bool ModeQSystemId::_enter()
     return true;
 }
 
-void ModeQStabilize::update()
+void ModeQSystemId::update()
 {
 
 }

diff --git a/ArduPlane/quadplane.cpp b/ArduPlane/quadplane.cpp
@@ -547,6 +547,10 @@ const AP_Param::GroupInfo QuadPlane::var_info2[] = {
     // @User: Standard
     AP_GROUPINFO("APPROACH_DIST", 39, QuadPlane, approach_distance, 0),
 
+    // @Group: SID
+    // @Path: mode_qsystemid.cpp
+    AP_SUBGROUPINFO(mode_qsystemid, "SID", 40, QuadPlane, ModeQSystemId),
+
     AP_GROUPEND
 };
 

diff --git a/ArduPlane/quadplane.h b/ArduPlane/quadplane.h
@@ -429,6 +429,8 @@ class QuadPlane
 
     AC_WeatherVane *weathervane;
 
+    void mode_qsystemid;
+
     bool initialised;
 
     Location last_auto_target;
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,7 +115,7 @@ bool ModeQSystemId::_enter() @@
         return true;
     }
-    void ModeQStabilize::update()
+    void ModeQSystemId::update()
     {
     }
@@ Expand Down @@