Changeset 33 in flair-bin for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/scripts/mavlink.xml

    r32 r33  
    22<root name="Manager">
    33  <TabWidget name="Main_TabWidget">
    4     <Tab name="mavlink">
    5       <TabWidget name="mavlink">
     4    <Tab name="GuiFlair">
     5      <TabWidget name="GuiFlair">
    66        <Tab name="Settings">
    77          <GroupBox name="Controls">
    8             <PushButton name="Initialize" value="1"/>
    9             <PushButton name="Start mission" value="1"/>
    10             <PushButton name="Stop mission" value="1"/>
    11             <PushButton name="Kill" value="1"/>
     8            <PushButton name="Start mission" value="0"/>
     9            <PushButton name="Stop mission" value="0"/>
     10            <PushButton name="Pause mission" value="0"/>
    1211          </GroupBox>
    13           <GroupBox name="Add waypoint">
    14             <DoubleSpinBox name="Latitude" value="3"/>
    15             <DoubleSpinBox name="Longitude" value="3"/>
    16             <PushButton name="Add mission wpt" value="1"/>
    17             <PushButton name="Add entrance wpt" value="1"/>
    18             <PushButton name="Add exit wpt" value="1"/>
     12          <GroupBox name="Add mission command">
     13            <ComboBox name="Select command" value="0"/>
     14            <DoubleSpinBox name="Param1" value="0"/>
     15            <DoubleSpinBox name="Latitude" value="1.5"/>
     16            <DoubleSpinBox name="Param2" value="0"/>
     17            <DoubleSpinBox name="Longitude" value="-1.5"/>
     18            <DoubleSpinBox name="Param3" value="0"/>
     19            <DoubleSpinBox name="Altitude" value="2"/>
     20            <PushButton name="Add mission cmd" value="1"/>
     21            <PushButton name="Del mission cmd" value="1"/>
     22            <PushButton name="Send mission" value="0"/>
    1923          </GroupBox>
    20           <GroupBox name="Show waypoints">
    21             <ListWidget name="Mission wpt" value="0" item1="36-12" item0="24-11" item2="3.000 - 3.000"/>
    22             <ListWidget name="Entrance wpt" item0="5.0-7.3"/>
    23             <ListWidget name="Exit wpt" item0="2.3-1.2" item1="6.6-12"/>
    24             <PushButton name="Remove mission wpt" value="1"/>
    25             <PushButton name="Remove entrance wpt" value="0"/>
    26             <PushButton name="Remove exit wpt" value="0"/>
     24          <GroupBox name="Show mission items">
     25            <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"/>
    2726          </GroupBox>
    28           <GroupBox name="Action">
    29             <PushButton name="Send wpt" value="1"/>
    30             <PushButton name="Clear wpt" value="1"/>
    31             <PushButton name="Loop" value="1"/>
    32           </GroupBox>         
    3327        </Tab>
    3428      </TabWidget>
    … …  
    3630  </TabWidget>
    3731  <TabWidget name="App_TabWidget">
    38     <Tab name="mavlink">
     32    <Tab name="MavPlanner">
    3933      <PushButton name="save config on target" value="1"/>
    4034    </Tab>
    4135  </TabWidget>
    42 <PushButton name="save config on target (mavlink)" value="1"/></root>
     36<PushButton name="save config on target (MavPlanner)" value="1"/></root>
Note: See TracChangeset for help on using the changeset viewer.