Changeset 384 in flair-src


Ignore:
Timestamp:
Dec 21, 2020, 1:48:07 PM (12 months ago)
Author:
Sanahuja Guillaume
Message:

update uav colors

Location:
trunk/demos/SimpleFleet
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/demos/SimpleFleet/simulator/resources/core2-64/simulator_x4.xml

    r333 r384  
    7474    <DoubleSpinBox value="70" name="fov:"/>
    7575   <Vector3DSpinBox name="position" value_x="0" value_y="0" value_z="0"/><Vector3DSpinBox name="direction" value_x="1.00" value_y="0.00" value_z="0.00"/><Vector3DSpinBox name="up" value_x="0.00" value_y="0.00" value_z="-1.00"/></Tab>
    76   </TabWidget>
     76  <Tab name="visual"><SpinBox name="arm color (R):" value="255"/><SpinBox name="arm color (G):" value="0"/><SpinBox name="arm color (B):" value="0"/></Tab></TabWidget>
    7777 </Tab>
    7878<Tab name="x4_1">
     
    147147    <DoubleSpinBox value="70" name="fov:"/>
    148148   <Vector3DSpinBox name="position" value_x="0" value_y="0" value_z="0"/><Vector3DSpinBox name="direction" value_x="1.00" value_y="0.00" value_z="0.00"/><Vector3DSpinBox name="up" value_x="0.00" value_y="0.00" value_z="-1.00"/></Tab>
    149   </TabWidget>
     149  <Tab name="visual"><SpinBox name="arm color (R):" value="0"/><SpinBox name="arm color (G):" value="255"/><SpinBox name="arm color (B):" value="0"/></Tab></TabWidget>
    150150 </Tab>
    151151  </TabWidget>
  • trunk/demos/SimpleFleet/simulator/resources/core2-64/simulator_x8.xml

    r301 r384  
    1616    <DoubleSpinBox value="-1.2" name="z:"/>
    1717    <SpinBox value="90" name="yaw (deg):"/>
    18    <Vector3DSpinBox name="position" value_x="1.5" value_y="0.00" value_z="-1.00"/></Tab>
     18   <Vector3DSpinBox name="position" value_x="1.5" value_y="0" value_z="-1"/></Tab>
    1919   <Tab name="model">
    2020    <DoubleSpinBox value="1.6" name="mass (kg):"/>
     
    3131    <DoubleSpinBox value="0.72" name="sigma:"/>
    3232    <DoubleSpinBox value="1" name="S:"/>
    33    </Tab>
     33   <SpinBox name="motor timeout:" value="100"/></Tab>
    3434   <Tab name="us">
    3535    <GroupBox name="position">
     
    8181    <DoubleSpinBox value="70" name="fov:"/>
    8282   </Tab>
    83   </TabWidget>
     83  <Tab name="visual"><SpinBox name="arm color (R):" value="255"/><SpinBox name="arm color (G):" value="0"/><SpinBox name="arm color (B):" value="0"/></Tab></TabWidget>
    8484 </Tab>
    8585 <Tab name="target">
     
    103103  </TabWidget>
    104104 </Tab>
    105 <Tab name="x8_1"><TabWidget name="tabs"><Tab name="sampling"><DoubleSpinBox name="Tech (s):" value="0.001"/></Tab><Tab name="optitrack"><CheckBox name="enabled" value="1"/></Tab><Tab name="init"><DoubleSpinBox name="x:" value="1.50"/><DoubleSpinBox name="y:" value="0.0"/><DoubleSpinBox name="z:" value="-1.2"/><SpinBox name="yaw (deg):" value="-90"/><Vector3DSpinBox name="position" value_x="-1.5" value_y="0.00" value_z="-1.00"/></Tab><Tab name="model"><DoubleSpinBox name="mass (kg):" value="1.6"/><DoubleSpinBox name="arm length (m):" value="0.2"/><DoubleSpinBox name="position G (m):" value="0"/><DoubleSpinBox name="k_mot:" value="0.001"/><DoubleSpinBox name="c_mot:" value="0.001"/><DoubleSpinBox name="f_air_vert:" value="0.01"/><DoubleSpinBox name="f_air_lat:" value="0.4"/><DoubleSpinBox name="j_roll:" value="0.006"/><DoubleSpinBox name="j_pitch:" value="0.006"/><DoubleSpinBox name="j_yaw:" value="0.1"/><DoubleSpinBox name="j_r:" value="0"/><DoubleSpinBox name="sigma:" value="0.72"/><DoubleSpinBox name="S:" value="1"/></Tab><Tab name="us"><GroupBox name="position"><DoubleSpinBox name="x:" value="0"/><DoubleSpinBox name="y:" value="0"/><DoubleSpinBox name="z:" value="0.04"/></GroupBox><GroupBox name="direction"><DoubleSpinBox name="x:" value="0"/><DoubleSpinBox name="y:" value="0"/><DoubleSpinBox name="z:" value="1"/></GroupBox><DoubleSpinBox name="range:" value="6"/><Vector3DSpinBox name="position" value_x="0" value_y="0" value_z="0.0399999991059303"/><Vector3DSpinBox name="direction" value_x="0" value_y="0" value_z="1"/></Tab></TabWidget></Tab></TabWidget>
     105<Tab name="x8_1"><TabWidget name="tabs"><Tab name="sampling"><DoubleSpinBox name="Tech (s):" value="0.001"/></Tab><Tab name="optitrack"><CheckBox name="enabled" value="1"/></Tab><Tab name="init"><DoubleSpinBox name="x:" value="1.50"/><DoubleSpinBox name="y:" value="0.0"/><DoubleSpinBox name="z:" value="-1.2"/><SpinBox name="yaw (deg):" value="-90"/><Vector3DSpinBox name="position" value_x="-1.5" value_y="0" value_z="-1"/></Tab><Tab name="model"><DoubleSpinBox name="mass (kg):" value="1.6"/><DoubleSpinBox name="arm length (m):" value="0.2"/><DoubleSpinBox name="position G (m):" value="0"/><DoubleSpinBox name="k_mot:" value="0.001"/><DoubleSpinBox name="c_mot:" value="0.001"/><DoubleSpinBox name="f_air_vert:" value="0.01"/><DoubleSpinBox name="f_air_lat:" value="0.4"/><DoubleSpinBox name="j_roll:" value="0.006"/><DoubleSpinBox name="j_pitch:" value="0.006"/><DoubleSpinBox name="j_yaw:" value="0.1"/><DoubleSpinBox name="j_r:" value="0"/><DoubleSpinBox name="sigma:" value="0.72"/><DoubleSpinBox name="S:" value="1"/><SpinBox name="motor timeout:" value="100"/></Tab><Tab name="us"><GroupBox name="position"><DoubleSpinBox name="x:" value="0"/><DoubleSpinBox name="y:" value="0"/><DoubleSpinBox name="z:" value="0.04"/></GroupBox><GroupBox name="direction"><DoubleSpinBox name="x:" value="0"/><DoubleSpinBox name="y:" value="0"/><DoubleSpinBox name="z:" value="1"/></GroupBox><DoubleSpinBox name="range:" value="6"/><Vector3DSpinBox name="position" value_x="0" value_y="0" value_z="0.0399999991059303"/><Vector3DSpinBox name="direction" value_x="0" value_y="0" value_z="1"/></Tab><Tab name="visual"><SpinBox name="arm color (R):" value="0"/><SpinBox name="arm color (G):" value="255"/><SpinBox name="arm color (B):" value="0"/></Tab></TabWidget></Tab></TabWidget>
    106106<TabWidget name="App_TabWidget"><Tab name="simulator"><PushButton name="save config on target" value="1"/></Tab></TabWidget><PushButton name="save config on target (simulator)" value="1"/></root>
  • trunk/demos/SimpleFleet/uav/src/SimpleFleet.h

    r178 r384  
    1919namespace flair {
    2020    namespace core {
    21         class FrameworkManager;
    2221        class UdpSocket;
    2322        class AhrsData;
Note: See TracChangeset for help on using the changeset viewer.