Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-27 08:55:51 +08:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Rotwing control update made compatible with master (#3374)

Browse Source
This commit is contained in:
Christophe De Wagter
2024-10-03 13:55:33 +02:00
committed by GitHub
parent 0abafed245
commit 4e98f10f67
32 changed files with 2072 additions and 3458 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/userconf/tudelft/RW_control_panel.xml
+10
View File
@@ -1506,5 +1506,15 @@
<arg flag="-g" constant="1050x300+0+1000"/>
</program>
</session>
<session name="RW25">
<program name="Data Link">
<arg flag="-udp"/>
</program>
<program name="Server"/>
<program name="Messages"/>
<program name="PprzGCS"/>
<program name="RotWingStatus"/>
<program name="Wind"/>
</session>
</section>
</control_panel>
conf/userconf/tudelft/conf.xml
+3 -3
View File
@@ -610,7 +610,7 @@
airframe="airframes/tudelft/rotwing_v3f.xml"
radio="radios/crossfire_sbus.xml"
telemetry="telemetry/highspeed_rotorcraft.xml"
flight_plan="flight_plans/tudelft/rotating_wing_EHVB.xml"
flight_plan="flight_plans/tudelft/rotating_wing_troia.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/air_data.xml modules/airspeed_ms45xx_i2c.xml modules/airspeed_uavcan.xml modules/approach_moving_target.xml modules/eff_scheduling_rotwing.xml modules/ekf_aw.xml modules/electrical.xml modules/follow_me.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_indi_hybrid.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/imu_heater.xml modules/ins_ekf2.xml modules/logger_sd_chibios.xml modules/nav_hybrid.xml modules/nav_rotorcraft.xml modules/parachute.xml modules/pfc_actuators.xml modules/preflight_checks.xml modules/rotwing_state.xml modules/stabilization_indi.xml modules/sys_id_auto_doublets.xml modules/sys_id_doublet.xml modules/target_pos.xml"
gui_color="red"
@@ -665,9 +665,9 @@
airframe="airframes/tudelft/rotwing5.xml"
radio="radios/crossfire_sbus.xml"
telemetry="telemetry/highspeed_rotorcraft.xml"
flight_plan="flight_plans/tudelft/rotating_wing_EHVB.xml"
flight_plan="flight_plans/tudelft/rotating_wing_troia.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/actuators_faulhaber.xml modules/air_data.xml modules/airspeed_ms45xx_i2c.xml modules/airspeed_uavcan.xml modules/approach_moving_target.xml modules/eff_scheduling_rotwing.xml modules/electrical.xml modules/follow_me.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_indi_hybrid.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/imu_heater.xml modules/ins_ekf2.xml modules/logger_sd_chibios.xml modules/nav_hybrid.xml modules/nav_rotorcraft.xml modules/preflight_checks.xml modules/rotwing_state.xml modules/stabilization_indi.xml modules/sys_id_auto_doublets.xml modules/sys_id_doublet.xml modules/target_pos.xml"
settings_modules="modules/actuators_faulhaber.xml modules/air_data.xml modules/airspeed_ms45xx_i2c.xml modules/airspeed_uavcan.xml modules/approach_moving_target.xml modules/eff_scheduling_rotwing.xml modules/electrical.xml modules/gps.xml modules/gps_ublox.xml modules/guidance_indi_hybrid.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/imu_heater.xml modules/ins_ekf2.xml modules/logger_sd_chibios.xml modules/nav_hybrid.xml modules/nav_rotorcraft.xml modules/preflight_checks.xml modules/rotwing_state.xml modules/stabilization_indi.xml modules/sys_id_auto_doublets.xml modules/sys_id_doublet.xml modules/target_pos.xml"
gui_color="red"
/>
<aircraft
conf/userconf/tudelft/control_panel.xml
+48 -4
View File
@@ -197,8 +197,8 @@
<program name="Messages"/>
<program name="PprzGCS"/>
<program name="Herelink PprzLink Router">
<arg flag="-e udp://192.168.0.11:5242:192.168.0.10:5243"/>
<arg flag="-e udp://0.0.0.0:4243:192.168.43.255:4242"/>
<arg flag="-e udp://192.168.0.11:5242:192.168.0.10:5243"/>
<arg flag="-e udp://0.0.0.0:4243:192.168.43.255:4242"/>
</program>
</session>
@@ -229,8 +229,8 @@
<arg flag="-udp"/>
</program>
<program name="Herelink PprzLink Router">
<arg flag="-e udp://192.168.0.11:5242:192.168.0.10:5243"/>
<arg flag="-e udp://0.0.0.0:4243:192.168.43.255:4242"/>
<arg flag="-e udp://192.168.0.11:5242:192.168.0.10:5243"/>
<arg flag="-e udp://0.0.0.0:4243:192.168.43.255:4242"/>
</program>
</session>
@@ -294,6 +294,50 @@
<program name="IridiumDialer"/>
</session>
<session name="RW25">
<program name="Data Link">
<arg flag="-udp"/>
</program>
<program name="Server"/>
<program name="Messages"/>
<program name="PprzGCS"/>
<program name="RotWingStatus"/>
<program name="Wind"/>
</session>
<session name="ROTATING_WING_STATE">
<program name="Messages"/>
<program name="Simulator">
<arg flag="-a" constant="RotatingWingV3B"/>
<arg flag="-t" constant="nps"/>
</program>
<program name="Data Link">
<arg flag="-udp"/>
<arg flag="-udp_broadcast"/>
</program>
<program name="Server">
<arg flag="-n"/>
</program>
<program name="PprzGCS"/>
<program name="Real-time Plotter">
<arg flag="-g" constant="1000x250-0+0"/>
<arg flag="-t" constant="SKEW"/>
<arg flag="-u" constant="0.05"/>
<arg flag="-c" constant="0.00"/>
<arg flag="-c" constant="*:telemetry:ROTATING_WING_STATE:meas_skew_angle"/>
<arg flag="-c" constant="*:telemetry:ROTATING_WING_STATE:sp_skew_angle"/>
<arg flag="-n"/>
<arg flag="-g" constant="1000x250-0+250"/>
<arg flag="-t" constant="SKEW"/>
<arg flag="-u" constant="0.05"/>
<arg flag="-c" constant="0.00"/>
<arg flag="-c" constant="*:telemetry:ROTATING_WING_STATE:nav_airspeed"/>
<arg flag="-c" constant="*:telemetry:ROTATING_WING_STATE:min_airspeed"/>
<arg flag="-c" constant="*:telemetry:ROTATING_WING_STATE:max_airspeed"/>
<arg flag="-c" constant="*:telemetry:AIR_DATA:airspeed"/>
</program>
</session>
<session name="Raw Sensors">
<program name="Real-time Plotter">
<arg flag="-g" constant="1000x250-0+0"/>