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

Aggieair updates (#2081)

Browse Source 
* Updated aggie air configs

* Updated configs and some small compilation fixes

* Added layouts and control_panel updates

* An example with a new flight plan. Note the plane doesn't fly very well because of the model mismatch.
This commit is contained in:
Michal Podhradsky
2017-06-21 10:51:53 -07:00
committed by GitHub
parent 979543cf53
commit 8806e853f3
21 changed files with 1161 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/gcs/AGGIEAIR/CSOIS_flyingwings.xml
+60
View File
@@ -0,0 +1,60 @@
<!DOCTYPE layout SYSTEM "../layout.dtd">
<layout width="1280" height="725">
<columns>
<rows SIZE="470">
<widget NAME="strips" SIZE="225"/>
<widget NAME="aircraft" SIZE="350"/>
<widget NAME="alarms"/>
</rows>
<rows>
<widget NAME="map2d">
<papget type="message_field" display="text" x="702" y="104">
<property name="scale" value="1."/>
<property name="field" value="AIRSPEED_IND:ind_airspeed"/>
<property name="format" value="%.2f"/>
<property name="size" value="15."/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="gauge" x="722" y="58">
<property name="scale" value="1."/>
<property name="field" value="AIRSPEED_IND:ind_airspeed"/>
<property name="min" value="0"/>
<property name="max" value="25"/>
<property name="size" value="50."/>
<property name="text" value="Airspeed"/>
</papget>
<papget type="message_field" display="led" x="204" y="21">
<property name="scale" value="1."/>
<property name="field" value="AGGIECAP:payloadstatus"/>
<property name="size" value="15."/>
<property name="text" value="Init"/>
</papget>
<papget type="message_field" display="led" x="203" y="74">
<property name="scale" value="1-1"/>
<property name="field" value="AGGIECAP:payloadstatus"/>
<property name="size" value="15."/>
<property name="text" value="Warm"/>
</papget>
<papget type="message_field" display="text" x="235" y="12">
<property name="scale" value="1."/>
<property name="field" value="AGGIECAP:capturenum"/>
<property name="format" value="Capture Num %.2f"/>
<property name="size" value="15."/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="led" x="205" y="47">
<property name="scale" value=".5-1"/>
<property name="field" value="AGGIECAP:payloadstatus"/>
<property name="size" value="15."/>
<property name="text" value="Cool"/>
</papget>
<papget type="message_field" display="led" x="204" y="102">
<property name="scale" value="1-1"/>
<property name="field" value="AGGIECAP:errorcode"/>
<property name="size" value="15."/>
<property name="text" value="Status"/>
</papget>
</widget>
</rows>
</columns>
</layout>
conf/gcs/AGGIEAIR/CSOIS_minions.xml
+29
View File
@@ -0,0 +1,29 @@
<!DOCTYPE layout SYSTEM "../layout.dtd">
<layout width="1215" height="776">
<columns>
<rows SIZE="470">
<widget NAME="strips" SIZE="225"/>
<widget NAME="aircraft" SIZE="350"/>
<widget NAME="alarms"/>
</rows>
<rows>
<widget NAME="map2d">
<papget type="message_field" display="text" x="682" y="107">
<property name="scale" value="1."/>
<property name="field" value="AIRSPEED_IND:ind_airspeed"/>
<property name="format" value="%.2f"/>
<property name="size" value="15."/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="gauge" x="696" y="60">
<property name="scale" value="1."/>
<property name="field" value="AIRSPEED_IND:ind_airspeed"/>
<property name="min" value="0"/>
<property name="max" value="25"/>
<property name="size" value="50."/>
<property name="text" value="Airspeed"/>
</papget>
</widget>
</rows>
</columns>
</layout>
conf/gcs/AGGIEAIR/CSOIS_minions_osu.xml
+86
View File
@@ -0,0 +1,86 @@
<!DOCTYPE layout SYSTEM "../layout.dtd">
<layout width="1280" height="725">
<columns>
<rows SIZE="470">
<widget NAME="strips" SIZE="225"/>
<widget NAME="aircraft" SIZE="350"/>
<widget NAME="alarms"/>
</rows>
<rows>
<widget NAME="map2d">
<papget type="message_field" display="led" x="204" y="102">
<property name="scale" value="1-1"/>
<property name="field" value="AGGIECAP:errorcode"/>
<property name="size" value="15."/>
<property name="text" value="Status"/>
</papget>
<papget type="message_field" display="gauge" x="722" y="58">
<property name="scale" value="1."/>
<property name="field" value="AIRSPEED_IND:ind_airspeed"/>
<property name="min" value="0"/>
<property name="max" value="25"/>
<property name="size" value="50."/>
<property name="text" value="Airspeed"/>
</papget>
<papget type="message_field" display="text" x="702" y="104">
<property name="scale" value="1."/>
<property name="field" value="AIRSPEED_IND:ind_airspeed"/>
<property name="format" value="%.2f"/>
<property name="size" value="15."/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="led" x="204" y="21">
<property name="scale" value="1."/>
<property name="field" value="AGGIECAP:payloadstatus"/>
<property name="size" value="15."/>
<property name="text" value="Init"/>
</papget>
<papget type="message_field" display="led" x="205" y="47">
<property name="scale" value=".5-1"/>
<property name="field" value="AGGIECAP:payloadstatus"/>
<property name="size" value="15."/>
<property name="text" value="Cool"/>
</papget>
<papget type="message_field" display="led" x="435" y="91">
<property name="scale" value="1-1899"/>
<property name="field" value="ACTUATORS:values[5]"/>
<property name="size" value="15."/>
<property name="text" value="off"/>
</papget>
<papget type="message_field" display="led" x="507" y="12">
<property name="scale" value="1-1580"/>
<property name="field" value="ACTUATORS:values[5]"/>
<property name="size" value="15."/>
<property name="text" value="med"/>
</papget>
<papget type="message_field" display="led" x="611" y="91">
<property name="scale" value="1-1262"/>
<property name="field" value="ACTUATORS:values[5]"/>
<property name="size" value="15."/>
<property name="text" value="full"/>
</papget>
<papget type="message_field" display="led" x="203" y="74">
<property name="scale" value="1-1"/>
<property name="field" value="AGGIECAP:payloadstatus"/>
<property name="size" value="15."/>
<property name="text" value="Warm"/>
</papget>
<papget type="message_field" display="text" x="235" y="12">
<property name="scale" value="1."/>
<property name="field" value="AGGIECAP:capturenum"/>
<property name="format" value="Capture Num %.2f"/>
<property name="size" value="15."/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="gauge" x="507" y="69">
<property name="scale" value="1."/>
<property name="field" value="ACTUATORS:values[5]"/>
<property name="min" value="1900"/>
<property name="max" value="1100"/>
<property name="size" value="50."/>
<property name="text" value="Crow"/>
</papget>
</widget>
</rows>
</columns>
</layout>
conf/gcs/AGGIEAIR/vertical.xml
+60 -32
View File
@@ -1,51 +1,79 @@
<layout width="1280" height="709">
<!DOCTYPE layout SYSTEM "../layout.dtd">
<layout width="1600" height="939">
<columns>
<rows SIZE="600">
<widget NAME="strips" SIZE="225"/>
<widget NAME="aircraft" SIZE="350"/>
<widget NAME="alarms"/>
<widget NAME="strips" size="225"/>
<widget NAME="aircraft" size="350"/>
<widget NAME="alarms" size="350"/>
</rows>
<rows>
<widget NAME="map2d">
<papget type="message_field" display="gauge" x="77" y="304">
<property name="field" value="CAMERA_PAYLOAD:used_memory"/>
<property name="scale" value="1.0"/>
<property name="min" value="0."/>
<property name="max" value="100."/>
<property name="size" value="50."/>
<property name="text" value="Used memory(%)"/>
</papget>
<papget type="message_field" display="gauge" x="74" y="198">
<property name="field" value="CAMERA_PAYLOAD:used_disk"/>
<property name="scale" value="1.0"/>
<property name="min" value="0."/>
<property name="max" value="100."/>
<property name="size" value="50."/>
<property name="text" value="Used disk(%)"/>
</papget>
<papget type="message_field" display="text" x="45" y="414">
<property name="field" value="CAMERA_PAYLOAD:error_code"/>
<widget NAME="map2d" size="937">
<papget type="message_field" display="text" x="145" y="11">
<property name="scale" value="1"/>
<property name="field" value="CAMERA_SNAPSHOT:array_temp"/>
<property name="format" value="FPA Temp: %.2f"/>
<property name="size" value="15."/>
<property name="format" value="Error code: %.0f"/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="led" x="151" y="395">
<papget type="message_field" display="gauge" x="60" y="176">
<property name="scale" value="1"/>
<property name="field" value="CAMERA_PAYLOAD:used_disk"/>
<property name="min" value="0."/>
<property name="max" value="100."/>
<property name="size" value="50."/>
<property name="text" value="Payload disk(%)"/>
</papget>
<papget type="message_field" display="led" x="465" y="22">
<property name="scale" value="1"/>
<property name="field" value="CAMERA_PAYLOAD:error_code"/>
<property name="size" value="15."/>
<property name="text" value="Error:"/>
<property name="test_value" value="0"/> <!-- will be green only if value==0 -->
<property name="test_invert" value="true"/>
<property name="text" value="Payload status:"/>
</papget>
<papget type="message_field" display="led" x="152" y="366">
<papget type="message_field" display="text" x="144" y="57">
<property name="scale" value="1"/>
<property name="field" value="CAMERA_SNAPSHOT:snapshot_image_number"/>
<property name="format" value="Capture number: %.0f"/>
<property name="size" value="15."/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="text" x="478" y="11">
<property name="scale" value="1"/>
<property name="field" value="CAMERA_PAYLOAD:error_code"/>
<property name="format" value="code: %.0f"/>
<property name="size" value="15."/>
<property name="color" value="green"/>
</papget>
<papget type="message_field" display="gauge" x="66" y="464">
<property name="scale" value="1."/>
<property name="field" value="COPILOT_STATUS:used_memory"/>
<property name="min" value="0."/>
<property name="max" value="100."/>
<property name="size" value="50."/>
<property name="text" value="Copilot mem(%)"/>
</papget>
<papget type="message_field" display="gauge" x="64" y="367">
<property name="scale" value="1."/>
<property name="field" value="COPILOT_STATUS:used_disk"/>
<property name="min" value="0."/>
<property name="max" value="100."/>
<property name="size" value="50."/>
<property name="text" value="Copilot disk(%)"/>
</papget>
<papget type="message_field" display="led" x="268" y="46">
<property name="scale" value="1"/>
<property name="field" value="CAMERA_PAYLOAD:door_status"/>
<property name="size" value="15."/>
<property name="text" value="Door status:"/>
<property name="test_value" value="2"/> <!-- will be green only if value==2 -->
<property name="test_invert" value="true"/>
</papget>
<papget type="message_field" display="gauge" x="64" y="272">
<property name="scale" value="1.0"/>
<property name="field" value="CAMERA_PAYLOAD:used_memory"/>
<property name="min" value="0."/>
<property name="max" value="100."/>
<property name="size" value="50."/>
<property name="text" value="Payload mem(%)"/>
</papget>
</widget>
</rows>
</columns>