Changeset 33 in flair-bin for trunk/tools/scripts

Timestamp:

Sep 28, 2016, 8:37:28 AM (8 years ago)

Author:

Thomas Fuhrmann

Message:

Change the xml to match with the new GUI of MavPlanner

File:

• trunk/tools/scripts/mavlink.xml (modified) (2 diffs)

trunk/tools/scripts/mavlink.xml

@@ -2 +2 @@
 <root name="Manager">
   <TabWidget name="Main_TabWidget">
-    <Tab name="mavlink">
-      <TabWidget name="mavlink">
+    <Tab name="GuiFlair">
+      <TabWidget name="GuiFlair">
         <Tab name="Settings">
           <GroupBox name="Controls">
-            <PushButton name="Initialize" value="1"/>
-            <PushButton name="Start mission" value="1"/>
-            <PushButton name="Stop mission" value="1"/>
-            <PushButton name="Kill" value="1"/>
+            <PushButton name="Start mission" value="0"/>
+            <PushButton name="Stop mission" value="0"/>
+            <PushButton name="Pause mission" value="0"/>
           </GroupBox>
-          <GroupBox name="Add waypoint">
-            <DoubleSpinBox name="Latitude" value="3"/>
-            <DoubleSpinBox name="Longitude" value="3"/>
-            <PushButton name="Add mission wpt" value="1"/>
-            <PushButton name="Add entrance wpt" value="1"/>
-            <PushButton name="Add exit wpt" value="1"/>
+          <GroupBox name="Add mission command">
+            <ComboBox name="Select command" value="0"/>
+            <DoubleSpinBox name="Param1" value="0"/>
+            <DoubleSpinBox name="Latitude" value="1.5"/>
+            <DoubleSpinBox name="Param2" value="0"/>
+            <DoubleSpinBox name="Longitude" value="-1.5"/>
+            <DoubleSpinBox name="Param3" value="0"/>
+            <DoubleSpinBox name="Altitude" value="2"/>
+            <PushButton name="Add mission cmd" value="1"/>
+            <PushButton name="Del mission cmd" value="1"/>
+            <PushButton name="Send mission" value="0"/>
           </GroupBox>
-          <GroupBox name="Show waypoints">
-            <ListWidget name="Mission wpt" value="0" item1="36-12" item0="24-11" item2="3.000 - 3.000"/>
-            <ListWidget name="Entrance wpt" item0="5.0-7.3"/>
-            <ListWidget name="Exit wpt" item0="2.3-1.2" item1="6.6-12"/>
-            <PushButton name="Remove mission wpt" value="1"/>
-            <PushButton name="Remove entrance wpt" value="0"/>
-            <PushButton name="Remove exit wpt" value="0"/>
+          <GroupBox name="Show mission items">
+            <ListWidget name="Mission cmd list" value="1" item0="TAKEOFF|0|0|0|1.5|2.0|3.0" item1="WAYPOINT|0|0|0|2.0|2.0|3.0"/>
           </GroupBox>
-          <GroupBox name="Action">
-            <PushButton name="Send wpt" value="1"/>
-            <PushButton name="Clear wpt" value="1"/>
-            <PushButton name="Loop" value="1"/>
-          </GroupBox>          
         </Tab>
       </TabWidget>
@@ -36 +30 @@
   </TabWidget>
   <TabWidget name="App_TabWidget">
-    <Tab name="mavlink">
+    <Tab name="MavPlanner">
       <PushButton name="save config on target" value="1"/>
     </Tab>
   </TabWidget>
-<PushButton name="save config on target (mavlink)" value="1"/></root>
+<PushButton name="save config on target (MavPlanner)" value="1"/></root>