diff --git a/ground/openpilotgcs/share/openpilotgcs/dials/default/arm-status.svg b/ground/openpilotgcs/share/openpilotgcs/dials/default/arm-status.svg old mode 100644 new mode 100755 index 5913ada22..b72d1cc33 --- a/ground/openpilotgcs/share/openpilotgcs/dials/default/arm-status.svg +++ b/ground/openpilotgcs/share/openpilotgcs/dials/default/arm-status.svg @@ -14,8 +14,8 @@ height="80.827866" id="svg10068" version="1.1" - inkscape:version="0.48.0 r9654" - sodipodi:docname="arm-status.svg" + inkscape:version="0.48.2 r9819" + sodipodi:docname="arm-status-new.svg" inkscape:export-filename="H:\Documents\Hobbies\W433\My Gauges\vbat-001.png" inkscape:export-xdpi="103.61" inkscape:export-ydpi="103.61" @@ -1224,6 +1224,82 @@ id="linearGradient3339" xlink:href="#linearGradient5128-0-5" inkscape:collect="always" /> + + + + + + + + + + + + + + + + image/svg+xml - + Edouard Lafargue @@ -1275,17 +1351,34 @@ - + + + + + + + style="fill:none;fill-opacity:1;stroke:none" /> + id="path3380" + inkscape:connector-curvature="0" /> + id="path3382" + inkscape:connector-curvature="0" /> + id="path3384" + inkscape:connector-curvature="0" /> diff --git a/ground/openpilotgcs/share/openpilotgcs/dials/default/flightmode-status.svg b/ground/openpilotgcs/share/openpilotgcs/dials/default/flightmode-status.svg old mode 100644 new mode 100755 index 80935d0c3..56f2ae83b --- a/ground/openpilotgcs/share/openpilotgcs/dials/default/flightmode-status.svg +++ b/ground/openpilotgcs/share/openpilotgcs/dials/default/flightmode-status.svg @@ -14,8 +14,8 @@ height="80.827866" id="svg10068" version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="flightmode-status.svg" + inkscape:version="0.48.2 r9819" + sodipodi:docname="flightmode-status-new.svg" inkscape:export-filename="H:\Documents\Hobbies\W433\My Gauges\vbat-001.png" inkscape:export-xdpi="103.61" inkscape:export-ydpi="103.61" @@ -1037,6 +1037,82 @@ fx="29.77438" fy="7.0922189" r="25.380436" /> + + + + + + + + + + + + + + + + image/svg+xml - + Edouard Lafargue @@ -1088,17 +1164,34 @@ - + + + + + + + style="fill:none;fill-opacity:1;stroke:none" /> + style="display:none" + sodipodi:insensitive="true"> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 58.403591,29.207693 a 29.010935,29.010935 0 1 1 -58.0218695,0 29.010935,29.010935 0 1 1 58.0218695,0 z" /> + d="m 53.950159,30.352861 a 24.175779,24.175779 0 1 1 -48.3515586,0 24.175779,24.175779 0 1 1 48.3515586,0 z" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 58.403591,29.207693 a 29.010935,29.010935 0 1 1 -58.0218695,0 29.010935,29.010935 0 1 1 58.0218695,0 z" /> + d="m 53.950159,30.352861 a 24.175779,24.175779 0 1 1 -48.3515586,0 24.175779,24.175779 0 1 1 48.3515586,0 z" /> + id="path2991" + inkscape:connector-curvature="0" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 58.403591,29.207693 a 29.010935,29.010935 0 1 1 -58.0218695,0 29.010935,29.010935 0 1 1 58.0218695,0 z" /> + d="m 53.950159,30.352861 a 24.175779,24.175779 0 1 1 -48.3515586,0 24.175779,24.175779 0 1 1 48.3515586,0 z" /> + style="opacity:0.98000004;fill:none;stroke:#ff4e34;stroke-width:2.7462945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + id="path3874" + inkscape:connector-curvature="0" /> + style="fill:none;stroke:#ff4e34;stroke-width:2.7462945;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 58.403591,29.207693 a 29.010935,29.010935 0 1 1 -58.0218695,0 29.010935,29.010935 0 1 1 58.0218695,0 z" /> + d="m 53.950159,30.352861 a 24.175779,24.175779 0 1 1 -48.3515586,0 24.175779,24.175779 0 1 1 48.3515586,0 z" /> + inkscape:export-ydpi="103.61" + inkscape:connector-curvature="0" /> @@ -1580,7 +1682,7 @@ sodipodi:cy="26.6875" sodipodi:cx="14.5" id="path3209" - d="m 24.5,26.6875 c 0,1.622336 -4.477153,2.9375 -10,2.9375 -5.5228475,0 -10,-1.315164 -10,-2.9375 0,-1.622336 4.4771525,-2.9375 10,-2.9375 5.522847,0 10,1.315164 10,2.9375 z" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 24.5,26.6875 a 10,2.9375 0 1 1 -20,0 10,2.9375 0 1 1 20,0 z" /> + d="m 58.403591,29.207693 a 29.010935,29.010935 0 1 1 -58.0218695,0 29.010935,29.010935 0 1 1 58.0218695,0 z" /> + d="m 53.950159,30.352861 a 24.175779,24.175779 0 1 1 -48.3515586,0 24.175779,24.175779 0 1 1 48.3515586,0 z" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml - + Edouard Lafargue @@ -468,21 +695,29 @@ inkscape:label="Dark background" id="g2932" inkscape:groupmode="layer" - transform="translate(-205.8687,-331.45166)"> + transform="translate(-205.8687,-331.45166)" + sodipodi:insensitive="true"> - + + + + + style="fill:none;stroke:none" /> + style="fill:#1a1a1a;fill-opacity:1;stroke:none;display:inline" /> - + style="display:inline" + sodipodi:insensitive="true"> + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + transform="translate(-227.44331,-365.7337)" + sodipodi:insensitive="true"> - + + + + + + + style="fill:url(#linearGradient3925);fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> - + + inkscape:label="#g4183"> + + + + + + + style="display:none" + sodipodi:insensitive="true"> - + inkscape:label="#g4292"> + + + + - + + inkscape:label="#g4338"> + + + + + style="display:none" + sodipodi:insensitive="true"> + inkscape:label="#path5747" + inkscape:connector-curvature="0" /> + style="display:none"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + style="fill:url(#linearGradient3124);fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> + - + + inkscape:label="#g4104" + transform="translate(0,-2)"> + + + + + + - + + inkscape:label="#g4159" + transform="translate(0,-2)"> + + + + - + + inkscape:label="#g4224" + transform="translate(0,-2)"> + + + + + style="display:none" + transform="translate(-129.62194,129.52019)" + sodipodi:insensitive="true"> + inkscape:label="#path5747" + inkscape:connector-curvature="0" /> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml - + Edouard Lafargue @@ -1000,29 +1139,6 @@ - - + + + + + + + + 0 0 - 626 - 842 + 648 + 802 @@ -1091,7 +1091,11 @@ false - #RateStabilizationGroup_15{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_15{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -1683,7 +1687,7 @@ border-radius: 4; true - + @@ -2234,7 +2238,7 @@ border-radius: 5; - + @@ -2784,7 +2788,7 @@ border-radius: 5; - + @@ -3407,24 +3411,24 @@ border-radius: 5; - - - - 0 - 0 - - + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -3439,6 +3443,22 @@ border-radius: 5; + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 22 + + + + + @@ -3482,30 +3502,30 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 objname:StabilizationSettings - fieldname:PitchRatePID + fieldname:RollRatePID element:Kp haslimits:yes scale:0.0001 @@ -3514,7 +3534,23 @@ border-radius: 5; - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 22 + + + + + @@ -3558,25 +3594,25 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -3654,24 +3690,24 @@ border-radius: 5; - - - - 0 - 0 - - + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -3685,7 +3721,7 @@ border-radius: 5; - + @@ -3729,25 +3765,25 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -3761,7 +3797,7 @@ border-radius: 5; - + @@ -3805,25 +3841,25 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -4433,7 +4469,11 @@ border-radius: 5; false - #RateStabilizationGroup_17{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_17{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -4967,7 +5007,7 @@ border-radius: 4; true - + @@ -5518,7 +5558,7 @@ border-radius: 5; - + @@ -6068,7 +6108,7 @@ border-radius: 5; - + @@ -6688,24 +6728,24 @@ border-radius: 5; - - - - 0 - 0 - - + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -6720,6 +6760,22 @@ border-radius: 5; + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 22 + + + + + @@ -6763,25 +6819,25 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -6795,7 +6851,23 @@ border-radius: 5; - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 22 + + + + + @@ -6839,25 +6911,25 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -6871,6 +6943,22 @@ border-radius: 5; + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 22 + + + + @@ -6935,24 +7023,24 @@ border-radius: 5; - - - - 0 - 0 - - + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -6966,7 +7054,7 @@ border-radius: 5; - + @@ -7010,25 +7098,25 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -7042,7 +7130,7 @@ border-radius: 5; - + @@ -7086,25 +7174,25 @@ border-radius: 5; - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -7208,7 +7296,7 @@ border-radius: 4; - + Qt::Horizontal @@ -7224,7 +7312,7 @@ border-radius: 4; - + @@ -7244,7 +7332,7 @@ border-radius: 4; - + @@ -7782,7 +7870,11 @@ border-radius: 4; false - #RateStabilizationGroup_19{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_19{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -8358,10 +8450,7 @@ border-radius: 4; true - - - 11 - + @@ -8912,7 +9001,7 @@ border-radius: 5; - + @@ -9462,7 +9551,7 @@ border-radius: 5; - + @@ -10082,24 +10171,24 @@ Angle - - - - 0 - 0 - - + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10113,6 +10202,22 @@ Angle + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 22 + + + + + @@ -10155,25 +10260,25 @@ Angle - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10186,7 +10291,23 @@ Angle - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 3 + 22 + + + + + @@ -10229,25 +10350,25 @@ Angle - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10325,24 +10446,24 @@ Rate - - - - 0 - 0 - - + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10356,7 +10477,7 @@ Rate - + @@ -10400,25 +10521,25 @@ Rate - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10432,7 +10553,7 @@ Rate - + @@ -10476,25 +10597,25 @@ Rate - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10573,24 +10694,24 @@ Attitude - - - - 0 - 0 - - + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10604,7 +10725,7 @@ Attitude - + @@ -10648,25 +10769,25 @@ Attitude - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10680,7 +10801,7 @@ Attitude - + @@ -10724,25 +10845,25 @@ Attitude - - - - - 0 - 0 - - + + - 21 - 16 + 43 + 22 - - + + + 43 + 22 + - - 50 + + 200 + + + 200 @@ -10762,7 +10883,7 @@ Attitude - + Qt::Vertical @@ -10778,7 +10899,7 @@ Attitude - + Qt::Vertical @@ -10810,7 +10931,7 @@ Attitude - + @@ -11348,7 +11469,11 @@ Attitude false - #RateStabilizationGroup_21{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_21{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -11399,13 +11524,6 @@ Attitude 20 - - - 8 - 50 - false - - If you check this, the GCS will udpate the stabilization factors automatically every 300ms, which will help for fast tuning. @@ -11432,44 +11550,6 @@ automatically every 300ms, which will help for fast tuning. - - - - 0 - 0 - - - - - 32 - 32 - - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 32 - 32 - - - - true - - - - button:help - url:http://wiki.openpilot.org/display/Doc/Stabilization+panel - - - - - @@ -11526,7 +11606,7 @@ border-radius: 4; - + @@ -11585,7 +11665,7 @@ border-radius: 4; - + @@ -11647,9 +11727,6 @@ border-radius: 4; - - - @@ -11674,8 +11751,8 @@ border-radius: 4; 0 0 - 626 - 828 + 648 + 798 @@ -12269,7 +12346,11 @@ border-radius: 4; false - #RateStabilizationGroup_8{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_8{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -15616,7 +15697,11 @@ You can usually go for higher values for Yaw factors. false - #RateStabilizationGroup_4{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_4{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -18931,7 +19016,11 @@ You can usually go for higher values for Yaw factors. false - #RateStabilizationGroup_6{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_6{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -22224,7 +22313,11 @@ You can usually go for higher values for Yaw factors. false - #RateStabilizationGroup_22{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255));} + #RateStabilizationGroup_22{background-color: qlineargradient(spread:pad, x1:0.507, y1:0.869318, x2:0.507, y2:0.0965909, stop:0 rgba(243, 243, 243, 255), stop:1 rgba(250, 250, 250, 255)); + +border: 1px outset #999; +border-radius: 3; +} @@ -22271,7 +22364,7 @@ You can usually go for higher values for Yaw factors. - 8 + 9 50 false @@ -22288,45 +22381,7 @@ automatically every 300ms, which will help for fast tuning. - - - - - 0 - 0 - - - - - 32 - 32 - - - - - - - - :/core/images/helpicon.svg:/core/images/helpicon.svg - - - - 32 - 32 - - - - true - - - - button:help - url:http://wiki.openpilot.org/display/Doc/Stabilization+panel - - - - - + Qt::Horizontal