Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-09 22:49:53 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

Herelink command (#3303)

Browse Source 
* Herelink command

* Cleanup control_panels
This commit is contained in:
Christophe De Wagter
2024-06-15 22:07:44 +02:00
committed by GitHub
parent 7adcd00fd7
commit 97ca88a017
7 changed files with 57 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/tools/herelink_pprzlink_router.xml
+4
View File
@@ -0,0 +1,4 @@
<program name="Herelink PprzLink Router" command="$adb shell /oem/bin/pprzlink_router_cc">
<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>
conf/tools/optitrack_distance_counter.xml
+1
View File
@@ -0,0 +1 @@
<program name="Optitrack Distance Counter" command="sw/ground_segment/python/distance_counter/dist.py"/>
conf/tools/vlc.xml
+3
View File
@@ -0,0 +1,3 @@
<program name="VLC" command="$vlc">
<arg flag="./sw/tools/rtp_viewer/rtp_5000.sdp"/>
</program>
conf/userconf/tudelft/control_panel.xml
+33 -65
View File
@@ -1,70 +1,12 @@
<control_panel name="paparazzi control panel">
<section name="programs">
<program name="Server" command="sw/ground_segment/tmtc/server"/>
<program name="Data Link" command="sw/ground_segment/tmtc/link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
</program>
<program name="Link Combiner" command="sw/ground_segment/python/redundant_link/link_combiner.py"/>
<program name="GCS" command="sw/ground_segment/cockpit/gcs">
<arg flag="-layout" constant="bottom_settings.xml"/>
</program>
<program name="Flight Plan Editor" command="sw/ground_segment/cockpit/gcs">
<arg flag="-edit"/>
</program>
<program name="Messages" command="sw/ground_segment/tmtc/messages"/>
<program name="Messages (Python)" command="sw/ground_segment/python/messages_app/messagesapp.py"/>
<program name="Settings" command="sw/ground_segment/tmtc/settings">
<arg flag="-ac" constant="@AIRCRAFT"/>
</program>
<program name="Settings (Python)" command="sw/ground_segment/python/settings_app/settingsapp.py"/>
<program name="GPSd position display" command="sw/ground_segment/tmtc/gpsd2ivy"/>
<program name="Log Plotter" command="sw/logalizer/logplotter"/>
<program name="Real-time Plotter" command="sw/logalizer/plotter"/>
<program name="Real-time Plotter (Python)" command="sw/ground_segment/python/real_time_plot/messagepicker.py"/>
<program name="Log File Player" command="sw/logalizer/play"/>
<program name="Video Synchronizer" command="sw/ground_segment/misc/video_synchronizer"/>
<program name="Joystick" command="sw/ground_segment/joystick/input2ivy">
<arg flag="-ac" constant="@AIRCRAFT"/>
<arg flag="xbox_gamepad.xml"/>
</program>
<program name="Hardware in the Loop" command="sw/simulator/simhitl"/>
<program name="Environment Simulator" command="sw/simulator/gaia"/>
<program name="Http Server" command="$python">
<arg flag="-m" constant="SimpleHTTPServer"/>
<arg flag="8889"/>
</program>
<program name="Plot Meteo Profile" command="sw/logalizer/plotprofile"/>
<program name="Weather Station" command="sw/ground_segment/misc/davis2ivy">
<arg flag="-d" constant="/dev/ttyUSB1"/>
</program>
<program name="Attitude Visualizer" command="sw/tools/attitude_viz.py"/>
<program name="App Server" command="sw/ground_segment/tmtc/app_server"/>
<program name="NatNet3" command="sw/ground_segment/python/natnet3.x/natnet2ivy.py"/>
<program name="Ivy2Nmea" command="sw/ground_segment/tmtc/ivy2nmea">
<arg flag="--port" constant="/dev/ttyUSB1"/>
<arg flag="--id" constant="1"/>
</program>
<program name="Gazebo" command="sw/tools/gzclient_launcher.sh"/>
<program name="BluegigaUsbDongleScanner" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
<arg flag="/dev/ttyACM2"/>
<arg flag="scan"/>
</program>
<program name="BluegigaUsbDongle" command="sw/tools/bluegiga_usb_dongle/bluegiga_usb_driver">
<arg flag="/dev/ttyACM2"/>
<arg flag="00:07:00:2d:d6:bb"/>
<arg flag="4242"/>
<arg flag="4252"/>
</program>
<program name="ADS-B Intruders receiver" command="sw/ground_segment/misc/sbs2ivy">
<arg flag="--ac" constant="@AC_ID"/>
</program>
<program name="ATC" command="sw/ground_segment/python/atc/atc.py"/>
<program name="Wind" command="sw/ground_segment/python/wind/wind.py"/>
<program name="SVInfo" command="sw/ground_segment/python/svinfo/svinfo.py"/>
<program name="EnergyManager" command="sw/ground_segment/python/energy_mon/energy_mon.py"/>
<program name="IridiumDialer" command="sw/tools/iridium/iridium_link.py"/>
<program name="PayloadForward" command="sw/ground_segment/python/payload_forward/payload.py"/>
</section>
<section name="sessions">
<session name="Bluegiga">
<program name="BluegigaUsbDongle">
@@ -95,6 +37,7 @@
<arg flag="hobbyking.xml"/>
</program>
</session>
<session name="Bluegiga">
<program name="Data Link">
<arg flag="-udp"/>
@@ -126,6 +69,7 @@
<arg flag="4252"/>
</program>
</session>
<session name="EKF Full">
<program name="Data Link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
@@ -198,6 +142,7 @@
<arg flag="-c" constant="*:telemetry:OPTICAL_FLOW:distance_compensated"/>
</program>
</session>
<session name="Flight /dev/paparazzi/link Transparent @57600">
<program name="Data Link">
<arg flag="-d" constant="/dev/paparazzi/link"/>
@@ -208,6 +153,7 @@
<arg flag="-speech"/>
</program>
</session>
<session name="Flight /dev/paparazzi/xbee XBeeAPI @57600">
<program name="Data Link">
<arg flag="-d" constant="/dev/paparazzi/xbee"/>
@@ -220,6 +166,7 @@
<arg flag="-layout" constant="bottom_settings.xml"/>
</program>
</session>
<session name="Flight ACM0 Transparent @57600">
<program name="Data Link">
<arg flag="-d" constant="/dev/ttyACM0"/>
@@ -230,6 +177,7 @@
<arg flag="-speech"/>
</program>
</session>
<session name="Flight ACM1 Transparent @57600">
<program name="Data Link">
<arg flag="-d" constant="/dev/ttyACM1"/>
@@ -240,6 +188,7 @@
<arg flag="-speech"/>
</program>
</session>
<session name="Flight UDP">
<program name="Data Link">
<arg flag="-udp"/>
@@ -247,7 +196,9 @@
<program name="Server"/>
<program name="Messages"/>
<program name="PprzGCS"/>
<program name="Herelink PprzLink Router"/>
</session>
<session name="Flight UDP Optitrack + Joystick">
<program name="Data Link">
<arg flag="-udp"/>
@@ -267,13 +218,16 @@
<arg flag="-zf"/>
</program>
</session>
<session name="Flight UDP/WiFi">
<program name="Server"/>
<program name="GCS"/>
<program name="Data Link">
<arg flag="-udp"/>
</program>
<program name="Herelink PprzLink Router"/>
</session>
<session name="Flight XBeeAPI USB0 @57600">
<program name="Data Link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
@@ -287,6 +241,7 @@
</program>
<program name="Messages"/>
</session>
<session name="Flight ttyUSB0 Transparent @57600">
<program name="Data Link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
@@ -297,36 +252,42 @@
<arg flag="-speech"/>
</program>
</session>
<session name="Hydrogen">
<program name="Attitude Visualizer"/>
<program name="HydrogenStatus"/>
<program name="NederdroneStatus"/>
<program name="ATC"/>
</session>
<session name="Joystick Hobbyking">
<program name="Joystick">
<arg flag="-ac" constant="@AIRCRAFT"/>
<arg flag="hobbyking.xml"/>
</program>
</session>
<session name="Joystick X3D Pro">
<program name="Joystick">
<arg flag="-ac" constant="@AIRCRAFT"/>
<arg flag="extreme_3d_pro.xml"/>
</program>
</session>
<session name="Messages and Settings">
<program name="Messages"/>
<program name="Settings">
<arg flag="-ac" constant="@AIRCRAFT"/>
</program>
</session>
<session name="PythonTools">
<program name="IridiumDialer"/>
<program name="PayloadForward"/>
<program name="SVInfo"/>
<program name="IridiumDialer"/>
</session>
<session name="Raw Sensors">
<program name="Real-time Plotter">
<arg flag="-g" constant="1000x250-0+0"/>
@@ -360,6 +321,7 @@
<arg flag="-c" constant="*:telemetry:BARO_RAW:abs"/>
</program>
</session>
<session name="Scaled Sensors">
<program name="Real-time Plotter">
<arg flag="-g" constant="1000x250-0+0"/>
@@ -389,6 +351,7 @@
<arg flag="-c" constant="*:telemetry:IMU_MAG_SCALED:mz:0.0004883"/>
</program>
</session>
<session name="Simulation - Gazebo">
<program name="Simulator">
<arg flag="-a" constant="@AIRCRAFT"/>
@@ -411,6 +374,7 @@
</program>
<program name="Gazebo"/>
</session>
<session name="Simulation - Gazebo + Joystick">
<program name="Simulator">
<arg flag="-a" constant="@AIRCRAFT"/>
@@ -431,6 +395,7 @@
<arg flag="-track_size" constant="200"/>
<arg flag="-zoom" constant="40."/>
</program>
<program name="Joystick">
<arg flag="-ac" constant="@AIRCRAFT"/>
<arg flag="hobbyking.xml"/>
@@ -438,6 +403,7 @@
</program>
<program name="Gazebo"/>
</session>
<session name="helidd">
<program name="BluegigaUsbDongle">
<arg flag="/dev/ttyACM0" constant="00:07:80:2d:d6:d9"/>
@@ -459,18 +425,20 @@
<arg flag="hobbyking.xml"/>
</program>
</session>
<session name="Ship">
<program name="Data Link">
<arg flag="-udp"/>
</program>
<program name="Server"/>
<program name="Messages"/>
<program name="Settings"/>
<program name="ATC">
<arg flag="-i" constant="11"/>
<arg flag="-e" constant="udp://0.0.0.0:12001:10.19.127.1:12000"/>
<arg flag="-r"/>
<program name="Herelink PprzLink Router"/>
<program name="Settings (Python)">
<arg constant="@AC_ID" flag="--ac_id" />
</program>
<program name="AeronauticalInfo"/>
<program name="RotWingStatus"/>
</session>
</section>
</control_panel>
conf/userconf/tudelft/course_conf.xml
+1 -1
View File
@@ -7,7 +7,7 @@
telemetry="telemetry/default_rotorcraft.xml"
flight_plan="flight_plans/tudelft/course_orangeavoid_cyberzoo.xml"
settings="settings/rotorcraft_basic.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/gps.xml modules/guidance_pid_rotorcraft.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_rotorcraft.xml modules/orange_avoider.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml"
settings_modules="modules/ahrs_int_cmpl_quat.xml modules/bebop_cam.xml modules/cv_detect_color_object.xml modules/electrical.xml modules/gps.xml modules/guidance_pid_rotorcraft.xml modules/guidance_rotorcraft.xml modules/imu_common.xml modules/ins_extended.xml modules/nav_rotorcraft.xml modules/orange_avoider.xml modules/stabilization_indi_simple.xml modules/video_capture.xml modules/video_rtp_stream.xml"
gui_color="white"
/>
<aircraft
conf/userconf/tudelft/course_control_panel.xml
+14 -54
View File
@@ -1,60 +1,9 @@
<control_panel name="paparazzi control panel">
<section name="programs">
<program name="Server" command="sw/ground_segment/tmtc/server"/>
<program name="Data Link" command="sw/ground_segment/tmtc/link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
</program>
<program name="GCS" command="sw/ground_segment/cockpit/gcs">
<arg flag="-speech"/>
<arg flag="-maximize"/>
<arg flag="-center_ac"/>
<arg flag="-mercator"/>
<arg flag="-maps_no_http"/>
<arg flag="-track_size" constant="200"/>
<arg flag="-zoom" constant="40."/>
</program>
<program name="Messages" command="sw/ground_segment/tmtc/messages"/>
<program name="Settings" command="sw/ground_segment/tmtc/settings">
<arg flag="-ac" constant="@AIRCRAFT"/>
</program>
<program name="Log Plotter" command="sw/logalizer/logplotter"/>
<program name="Real-time Plotter" command="sw/logalizer/plotter"/>
<program name="Log File Player" command="sw/logalizer/play"/>
<program name="Simulator" command="sw/simulator/pprzsim-launch"/>
<program name="Joystick" command="sw/ground_segment/joystick/input2ivy">
<arg flag="-ac" constant="@AIRCRAFT"/>
<arg flag="sm600.xml"/>
</program>
<program name="Environment Simulator" command="sw/simulator/gaia"/>
<program name="NatNet3" command="sw/ground_segment/python/natnet3.x/natnet2ivy.py"/>
<program name="Gazebo" command="sw/tools/gzclient_launcher.sh"/>
<program name="Real-time Distance Counter" command="sw/ground_segment/python/distance_counter/dist.py"/>
</section>
<section name="sessions">
<session name="Simulation - Gazebo">
<program name="Simulator">
<arg flag="-a" constant="@AIRCRAFT"/>
<arg flag="-t" constant="nps"/>
</program>
<program name="Data Link">
<arg flag="-udp"/>
<arg flag="-ping_period" constant="100"/>
</program>
<program name="Server">
<arg flag="-n"/>
</program>
<program name="GCS">
<arg flag="-speech"/>
<arg flag="-maximize"/>
<arg flag="-center_ac"/>
<arg flag="-mercator"/>
<arg flag="-maps_no_http"/>
<arg flag="-track_size" constant="200"/>
<arg flag="-zoom" constant="40."/>
</program>
<program name="Gazebo"/>
</session>
<session name="Simulation - Gazebo + Joystick">
<session name="Simulation - Gazebo">
<program name="Simulator">
<arg flag="-a" constant="@AIRCRAFT"/>
<arg flag="-t" constant="nps"/>
@@ -81,7 +30,12 @@
<arg flag="-d 0"/>
</program>
<program name="Gazebo"/>
<program name="RtpViewer"/>
<program name="VLC">
<arg flag="./sw/tools/rtp_viewer/rtp_5000.sdp"/>
</program>
</session>
<session name="Flight UDP">
<program name="Data Link">
<arg flag="-udp"/>
@@ -101,9 +55,15 @@
<arg flag="-an" constant="far"/>
<arg flag="-le" constant="far"/>
</program>
<program name="RtpViewer"/>
<program name="VLC">
<arg flag="./sw/tools/rtp_viewer/rtp_5000.sdp"/>
</program>
</session>
<session name="Distance Counter">
<program name="Real-time Distance Counter"/>
<program name="Optitrack Distance Counter"/>
</session>
</section>
</control_panel>
conf/userconf/tudelft/guido_control_panel.xml
+1 -30
View File
@@ -1,34 +1,5 @@
<control_panel name="paparazzi control panel">
<section name="programs">
<program name="Server" command="sw/ground_segment/tmtc/server"/>
<program name="Data Link" command="sw/ground_segment/tmtc/link">
<arg flag="-d" constant="/dev/ttyUSB0"/>
</program>
<program name="GCS" command="sw/ground_segment/cockpit/gcs">
<arg flag="-speech"/>
<arg flag="-maximize"/>
<arg flag="-center_ac"/>
<arg flag="-mercator"/>
<arg flag="-maps_no_http"/>
<arg flag="-track_size" constant="200"/>
<arg flag="-zoom" constant="40."/>
</program>
<program name="Messages" command="sw/ground_segment/tmtc/messages"/>
<program name="Settings" command="sw/ground_segment/tmtc/settings">
<arg flag="-ac" constant="@AIRCRAFT"/>
</program>
<program name="Log Plotter" command="sw/logalizer/logplotter"/>
<program name="Real-time Plotter" command="sw/logalizer/plotter"/>
<program name="Log File Player" command="sw/logalizer/play"/>
<program name="Simulator" command="sw/simulator/pprzsim-launch"/>
<program name="Joystick" command="sw/ground_segment/joystick/input2ivy">
<arg flag="-ac" constant="@AIRCRAFT"/>
<arg flag="sm600.xml"/>
</program>
<program name="Environment Simulator" command="sw/simulator/gaia"/>
<program name="NatNet" command="sw/ground_segment/misc/natnet2ivy"/>
<program name="Gazebo" command="sw/tools/gzclient_launcher.sh"/>
<program name="Real-time Distance Counter" command="sw/ground_segment/python/distance_counter/dist.py"/>
</section>
<section name="sessions">
<session name="Simulation - Gazebo">
@@ -100,7 +71,7 @@
</program>
</session>
<session name="Distance Counter">
<program name="Real-time Distance Counter"/>
<program name="Optitrack Distance Counter"/>
</session>
<session name="optic flow hover">
<program name="Data Link">