[fix] errors from last 10 PR (#3138)

paparazzi · Oct 9, 2023 · 6505098 · 6505098
1 parent 5af84a4
commit 6505098
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/conf/airframes/tudelft/bebop_opticflow_indoor_2x_30hz.xml b/conf/airframes/tudelft/bebop_opticflow_indoor_2x_30hz.xml
@@ -27,6 +27,8 @@ pyramid level 2: 21 fps average, min=11fps
     <module name="imu" type="bebop"/>
     <module name="stabilization" type="indi">
       <define name="STABILIZATION_INDI_RPM_FEEDBACK" value="TRUE"/>
+      <define name="WLS_N_U" value="4"/>
+      <define name="WLS_N_V" value="4"/>
     </module>
     <module name="ahrs" type="int_cmpl_quat">
       <configure name="USE_MAGNETOMETER" value="FALSE"/>

diff --git a/conf/airframes/tudelft/heli450.xml b/conf/airframes/tudelft/heli450.xml
@@ -27,7 +27,9 @@
     <module name="air_data"/>
     <module name="gps" type="ubx_ucenter"/>
     <module name="heli_swashplate_mixing"/>
-    <module name="heli_throttle_curve"/>
+    <module name="heli_throttle_curve">
+      <define name="THROTTLE_CURVE_RPM_ACT" value="0"/>
+    </module>
   </firmware>
 
   <servos driver="Pwm">

diff --git a/conf/airframes/tudelft/logo600.xml b/conf/airframes/tudelft/logo600.xml
@@ -43,7 +43,9 @@ The xml in master currently configures the LOGO600 as a pure model aircraft: mea
       <module name="intermcu"      type="uart">
         <define name="REMAP_UART3" value="TRUE"/>
       </module>
-      <module name="heli" type="throttle_curve"/>
+      <module name="heli" type="throttle_curve">
+        <define name="THROTTLE_CURVE_RPM_ACT" value="0"/>
+      </module>
 
       <module name="geo_mag"/>
       <module name="air_data"/>

diff --git a/conf/airframes/tudelft/outback.xml b/conf/airframes/tudelft/outback.xml
@@ -56,7 +56,9 @@
         <define name="SDLOGGER_ON_ARM" value="TRUE"/>
       </module>
       <module name="gps_ubx_ucenter"/>
-      <module name="heli_throttle_curve"/>
+      <module name="heli_throttle_curve">
+        <define name="THROTTLE_CURVE_RPM_ACT" value="0"/>
+      </module>
       <define name="ROTORCRAFT_IS_HELI" value="TRUE" />
       <define name="RC_LOST_MODE" value="AP_MODE_NAV" />
     </target>