Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 01:53:48 +08:00
Code Issues Actions 31 Packages Projects Releases Wiki Activity

FIXED two typos in two files (#2620)

Browse Source 
* FIX removed non existent module

The fixed_wing_cam_v1 module is not part of paparazzi.

* FIX replaced one call keyword with call_once

* FIX replaced the last value of 1 with true

* FIX another 1 was replaced with true

I think this time everything is fine.

* FIX removed two unneeded definitions.
This commit is contained in:
hendrixgr
2020-11-16 10:30:19 +02:00
committed by GitHub
parent ce5d9680e6
commit 97c916697f
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/matek_f405_wing/Easyglider_matek_f405_autoload.xml
-2
View File
@@ -27,8 +27,6 @@
<define name="USE_ADC_4"/>
<define name="AHRS_TRIGGERED_ATTITUDE_LOOP"/>
<define name="USE_AHRS_GPS_ACCELERATIONS"/>
<define name="MAGNETOMETER_AVAILABLE" value="0" />
<define name="BAROMETER_AVAILABLE" value="0" />
<!-- load standard internal sensors, then custom modules -->
<module name="board_matek_wing">
conf/airframes/matek_f405_wing/Easyglider_matek_f405_wing.xml
+1 -2
View File
@@ -90,8 +90,7 @@
<define name="FIXED_WIND_DIRECTION_FOR_TESTING" value="330.0" />
<define name="FIXED_WIND_SPEED_FOR_TESTING" value="10.0" />
</module>
<module name="fixed_wing_cam_v1"/>
</firmware>
<firmware name="setup">
conf/flight_plans/lagonisi_beach_survey.xml
+4 -4
View File
@@ -32,7 +32,7 @@
<blocks>
<block name="Wait Gps">
<set value="false" var="h_ctl_disabled"/>
<set value="1" var="autopilot.kill_throttle"/>
<set value="true" var="autopilot.kill_throttle"/>
<call_once fun="imcu_set_command(COMMAND_FLAPS, 0)" />
<while cond="!GpsFixValid()"/>
</block>
@@ -43,8 +43,8 @@
</block>
<block name="Holding Point">
<exception cond="((imcu_get_radio(RADIO_THROTTLE) > (MAX_PPRZ-(MAX_PPRZ/10)))&&(autopilot.mode == AP_MODE_AUTO2))" deroute="Takeoff"/>
<set value="1" var="autopilot.kill_throttle"/>
<call fun="imcu_set_command(COMMAND_FLAPS, MAX_PPRZ/2)"/>
<set value="true" var="autopilot.kill_throttle"/>
<call_once fun="imcu_set_command(COMMAND_FLAPS, MAX_PPRZ/2)"/>
<call_once fun="imcu_set_command(COMMAND_FLAPS, MAX_PPRZ/2)" />
<attitude roll="0" throttle="0" until="((sqrt(dist2_to_home) > 10)&& (700 > gps.pdop))" vmode="throttle"/>
<deroute block="Takeoff"/>
@@ -148,7 +148,7 @@
<go from="MOB" hmode="route" wp="RELEASE"/>
<attitude pitch="10" roll="0.0" throttle="0" until="MINIMUM_AIRSPEED > stateGetHorizontalSpeedNorm_f()" vmode="throttle"/>
<call fun="DeployParachute()"/>
<set value="1" var="autopilot.kill_throttle"/>
<set value="true" var="autopilot.kill_throttle"/>
<circle height="70." radius="nav_radius" wp="HOME"/>
</block>
</blocks>