diff --git a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml index bf4e7ccbc..88032dc41 100644 --- a/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml +++ b/ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS.xml @@ -2582,7 +2582,7 @@ splitter 2 - @Variant(AAAACQAAAAIAAAACAAAB7wAAAAIAAAEf) + @Variant(AAAACQAAAAIAAAACAAABqQAAAAIAAADm) splitter @@ -2759,7 +2759,7 @@ uavGadget 1 - @Variant(AAAACQAAAAIAAAACAAABQgAAAAIAAAGM) + @Variant(AAAACQAAAAIAAAACAAAAxwAAAAIAAAFi) splitter diff --git a/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg b/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg index 884c78717..2a65f1202 100644 --- a/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg +++ b/ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg @@ -10,7 +10,7 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="94.2584" + width="113.03149" height="79.57505" id="svg3604" version="1.1" @@ -27,10 +27,10 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="29.851822" - inkscape:cx="82.604436" - inkscape:cy="54.252252" - inkscape:current-layer="background" + inkscape:zoom="5.2771064" + inkscape:cx="50.100274" + inkscape:cy="37.563212" + inkscape:current-layer="layer36" id="namedview3608" showgrid="true" inkscape:window-width="1366" @@ -40,7 +40,8 @@ inkscape:window-maximized="1" showguides="true" inkscape:guide-bbox="true" - inkscape:snap-global="false"> + inkscape:snap-global="false" + units="mm"> + id="grid4540" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + style="fill:#918a6f;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09500301;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + + + + + + - - - - - - - - - - SYSTEM HEALTH + x="529.24725" + y="379.43469">SYSTEM HEALTH Sensors + id="tspan5393" + x="-426.10474" + y="440.35391">SENSR Auto + id="tspan5375" + x="-408.18991" + y="440.35474">AUTO Misc. + id="tspan5383" + x="-463.11954" + y="481.81909">MISC Link - Power + id="tspan5387" + x="-462.91629" + y="440.35474">PWR Syst. + id="tspan5389" + x="-478.508" + y="440.35391">SYS - - - - - I/O + x="-444.87003" + y="440.35474">I/O + x="531.36542" + y="383.37735" /> - - + rx="1.3377603" /> + style="fill:#28170b;fill-opacity:1;stroke:none;display:inline" /> + + + + + + + + LINK + + style="display:none"> @@ -1113,15 +1090,15 @@ inkscape:groupmode="layer" id="layer11" inkscape:label="Airspeed-OK" - style="display:inline"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> @@ -1203,88 +1180,88 @@ inkscape:groupmode="layer" id="layer6" inkscape:label="Attitude-OK" - style="display:inline"> + style="display:none"> + style="display:none"> + style="display:none"> + width="19.072226" + height="9.5041265" + x="7.0544181" + y="66.481804" + ry="0.92200589" /> + style="display:none"> + style="display:none"> + style="display:none"> @@ -1292,123 +1269,122 @@ inkscape:groupmode="layer" id="layer21" inkscape:label="I2C-OK" - style="display:inline"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + rx="1.0773503" /> + style="display:none"> + rx="1.0672916" /> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + width="19.113802" + height="9.550107" + x="7.0522652" + y="66.473434" + ry="0.92646646" /> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + rx="1.0032097" /> + rx="1.2054718" /> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> @@ -1792,73 +1767,73 @@ inkscape:groupmode="layer" id="g5432" inkscape:label="Stabilization-Critical" - style="display:inline"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + width="19.139223" + height="9.5711241" + x="7.0209193" + y="66.448311" + ry="0.92850536" /> + style="display:none"> @@ -1866,29 +1841,29 @@ inkscape:groupmode="layer" id="g5448" inkscape:label="Telemetry-Critical" - style="display:inline"> + style="display:none"> + style="display:none"> @@ -1896,92 +1871,92 @@ inkscape:groupmode="layer" id="g5454" inkscape:label="I2C-Critical" - style="display:inline"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + style="display:none"> + rx="1.4796101" /> + rx="0.97841418" /> + style="display:none"> + transform="matrix(1.303815,0,0,1.0006407,-2.9181954,0.76728593)"> + style="display:none"> + inkscape:label="#g3394" + transform="matrix(1.3060972,0,0,1.0001794,-9.286657,0.26650193)"> + style="display:none"> + inkscape:label="#g3390" + transform="matrix(1.3027754,0,0,1.0133326,-6.8947082,0.12363438)"> + style="display:none"> + inkscape:label="#g3386" + transform="matrix(1.2992362,0,0,1.0066736,-4.7769775,0.17889491)"> + style="display:none"> + transform="matrix(1.2972911,0,0,1.0167477,-6.6181285,0.34411746)"> + transform="matrix(1.299095,0,0,1.0167223,19.677703,0.38071462)"> + style="display:none"> + inkscape:label="#g3402" + transform="matrix(1.2955541,0,0,1.0099811,-4.6286669,0.49590947)"> + style="display:none"> + transform="matrix(1.011145,0,0,1,-1.2370971,0)" + inkscape:label="#g4252"> + d="m 77.702794,38.300164 32.588486,8.785433" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="M 77.775534,47.107864 110.25087,38.334251" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:none"> + transform="matrix(1.2670269,0,0,1.0033347,-2.5810186,20.235292)"> + style="display:none"> + transform="matrix(1,0,0,0.99018386,0,0.46977719)" + inkscape:label="#g4238"> + d="m 32.903038,38.329601 23.045017,8.819383" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="M 32.871366,47.123473 56.000932,38.328432" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + + + + + style="display:none"> + transform="matrix(0.99487041,0,0,0.96829624,0.0347729,1.7751095)" + inkscape:label="#g4456"> + d="m 7.5498082,52.475403 18.0821878,9.14342" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="M 7.476225,61.518003 25.673064,52.498768" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:none"> + transform="matrix(0.99485498,0,0,0.97451479,0.20647751,1.4858328)" + inkscape:label="#g4450"> + d="M 27.859968,52.440362 45.94248,61.519868" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="m 27.809675,61.534279 18.104198,-9.06903" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:none"> + transform="matrix(1.0165533,0,0,0.96183155,-1.1730886,2.2079995)" + inkscape:label="#g4438"> + d="m 55.345762,52.390536 22.824505,9.161262" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.36421418;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:none;display:inline" /> + d="M 55.34692,61.535992 78.294994,52.441927" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.36357629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:none;display:inline" /> + style="display:none"> + transform="matrix(0.99024567,0,0,0.95640592,0.16475989,3.1867166)" + inkscape:label="#g4462"> + d="M 7.3536543,66.894221 26.479682,75.463174" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="M 7.2898997,75.446981 26.492007,66.951786" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:none"> + inkscape:label="#g4230"> + d="M 7.431639,4.1245053 31.174293,12.957929" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.36696184;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="M 7.4395349,12.867421 31.253381,4.1209894" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.36225235;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:none"> + transform="matrix(0.99672458,0,0,0.95325152,0.02398426,3.264316)" + inkscape:label="#g4468"> + d="M 28.467187,75.543139 47.482776,66.983913" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="m 28.485471,66.956843 19.057384,8.607021" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> - - - - - + style="display:none" /> + style="display:none"> + transform="matrix(0.99998704,0,0,0.94992153,-0.13295657,3.5178711)" + inkscape:label="#g4480"> + d="M 70.524713,75.503806 89.549784,66.963359" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="m 70.587491,66.948946 18.977538,8.603257" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:none"> + transform="matrix(1.0098947,0,0,0.9498994,-0.68444657,3.4889072)" + inkscape:label="#g4474"> + d="M 49.577304,75.608168 68.400595,67.02704" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="M 49.568595,67.011059 68.46447,75.537737" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + style="display:none"> + transform="matrix(1,0,0,0.94690781,0,3.7499736)" + inkscape:label="#g4486"> + d="M 91.332053,75.577785 110.51399,66.934663" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + d="M 91.383458,66.928045 110.4856,75.596579" + style="fill:#ff0000;stroke:#ff0000;stroke-width:1.41732287;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + width="112.74295" + height="78.96769" + x="0.30367571" + y="0.30368456" + ry="0.99887496" /> PATH + x="78.238228" + y="9.280242">PATH PLAN + x="108.69147" + y="9.2802429">PLAN ATTITUDE + id="tspan5813" + x="15.664986" + y="9.2802429">ATTI STAB + x="46.510185" + y="9.2787771">STAB GPS + x="16.553135" + y="21.460487">GPS SENSORS + id="tspan5858" + x="41.87249" + y="21.460487">SENSOR AIRSPEED + id="tspan5860" + x="75.206001" + y="21.460487">AIRSPD MAG + x="110.314" + y="21.461952">MAG CPU + x="118.93848" + y="59.436008">CPU EVENT + id="tspan5907" + x="88.885544" + y="59.436008">EVENT MEM. + id="tspan3865" + x="39.798244" + y="59.436008">MEM STACK + id="tspan5905" + x="62.485939" + y="59.434544">STACK I2C + x="74.377625" + y="36.536701">I2C CONF. + id="tspan5978" + x="68.291183" + y="49.551472">CONFIG BOOT + id="tspan5864" + x="11.171983" + y="61.392075">BOOT TELEM. + id="tspan5862" + x="94.109077" + y="37.710892">TELEMETRY BATT. + id="tspan4077" + x="11.343655" + y="49.551472">BATT TIME - + x="36.921585" + y="49.551472">TIME + style="fill:none;stroke:#ffffff;stroke-width:0.70866144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> - - - - - - - - - - - - - - - - - - - - + style="fill:none;stroke:#ffffff;stroke-width:0.70866144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> INPUT - - + id="tspan5909" + x="13.357648" + y="37.674271">INPUT OUTPUT + id="tspan5911" + x="40.654816" + y="37.710892">OUTPUT + + + + + + + + + + + + + + + + + + + +