From b68236fd72afabcd13acb7ee0738af603ad996b9 Mon Sep 17 00:00:00 2001 From: Laurent Lalanne Date: Thu, 25 Sep 2014 07:30:35 +0200 Subject: [PATCH 1/4] OP-1508 Sbus fixes, new artwork from OP-1222 --- .../resources/connection-diagrams.svg | 41781 ++++++++++++---- 1 file changed, 32916 insertions(+), 8865 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg b/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg index f62e09121..fefc1c59a 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg +++ b/ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg @@ -2,6 +2,7 @@ + fit-margin-bottom="15" + inkscape:snap-grids="true" + showguides="false" + inkscape:guide-bbox="true" + inkscape:snap-global="true" + inkscape:snap-bbox="true" + inkscape:object-paths="true" + inkscape:snap-bbox-midpoints="true" + inkscape:snap-bbox-edge-midpoints="true"> + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,7 +188,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10073"> @@ -99,7 +220,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10105"> @@ -128,7 +249,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10165"> @@ -136,7 +257,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10181"> @@ -152,7 +273,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10213"> @@ -168,7 +289,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10269"> @@ -176,7 +297,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10285"> @@ -192,7 +313,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath10317"> @@ -208,7 +329,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4329"> @@ -216,7 +337,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4345"> @@ -232,7 +353,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4377"> @@ -264,7 +385,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4437"> @@ -272,7 +393,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4453"> @@ -288,7 +409,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4485"> @@ -312,7 +433,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4925"> @@ -320,7 +441,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4941"> @@ -336,7 +457,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath4973"> @@ -365,7 +486,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7903"> @@ -373,7 +494,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7919"> @@ -389,7 +510,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7951"> @@ -418,7 +539,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5467"> @@ -426,7 +547,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5483"> @@ -434,7 +555,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5499"> @@ -442,7 +563,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5515"> @@ -450,7 +571,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5553"> @@ -466,7 +587,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5585"> @@ -482,7 +603,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5617"> @@ -498,7 +619,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5649"> @@ -514,7 +635,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5681"> @@ -530,7 +651,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5713"> @@ -546,7 +667,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5745"> @@ -562,7 +683,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5777"> @@ -591,7 +712,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7159"> @@ -599,7 +720,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7175"> @@ -615,7 +736,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7207"> @@ -631,7 +752,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7239"> @@ -639,7 +760,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7255"> @@ -655,7 +776,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7287"> @@ -671,7 +792,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7319"> @@ -679,7 +800,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7335"> @@ -695,7 +816,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7367"> @@ -711,7 +832,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7423"> @@ -719,7 +840,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7439"> @@ -735,7 +856,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7471"> @@ -751,7 +872,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7503"> @@ -759,7 +880,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7519"> @@ -775,7 +896,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7551"> @@ -791,7 +912,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7583"> @@ -799,7 +920,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7599"> @@ -815,7 +936,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath7631"> @@ -844,7 +965,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5841"> @@ -852,7 +973,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5857"> @@ -860,7 +981,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5873"> @@ -868,7 +989,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5889"> @@ -876,7 +997,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5905"> @@ -892,7 +1013,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5937"> @@ -908,7 +1029,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5969"> @@ -924,7 +1045,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6001"> @@ -940,7 +1061,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6033"> @@ -956,7 +1077,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6065"> @@ -972,7 +1093,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6097"> @@ -988,7 +1109,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6129"> @@ -1004,7 +1125,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6169"> @@ -1012,7 +1133,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6185"> @@ -1028,7 +1149,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6217"> @@ -1044,7 +1165,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6273"> @@ -1052,7 +1173,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6289"> @@ -1068,7 +1189,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath6321"> @@ -1097,7 +1218,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5049"> @@ -1105,7 +1226,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5065"> @@ -1113,7 +1234,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5081"> @@ -1121,7 +1242,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5097"> @@ -1129,7 +1250,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5135"> @@ -1145,7 +1266,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5167"> @@ -1161,7 +1282,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5199"> @@ -1177,7 +1298,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5231"> @@ -1193,7 +1314,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5263"> @@ -1209,7 +1330,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5295"> @@ -1233,7 +1354,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5327"> @@ -1241,7 +1362,7 @@ clipPathUnits="userSpaceOnUse" id="clipPath5359"> @@ -1303,135 +1424,6 @@ stop-color="#FFF" id="stop6616" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="linearGradient4377-9"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2181,79 +10289,18549 @@ image/svg+xml - + + inkscape:groupmode="layer" + id="layer35" + inkscape:label="background" + style="display:none" + sodipodi:insensitive="true" + transform="translate(9.5291677,71.377308)"> + + + + + + + + + + + + + + + Futaba + S-Bus + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id="g5373" + transform="matrix(1,0,0,-1,0,2792.2535)"> + id="g5375" + clip-path="url(#clipPath5359-0)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10070-3)" /> @@ -3050,229 +30049,213 @@ + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + style="fill:#2f2d2e;fill-rule:nonzero" /> + style="fill:#c8c7c6;fill-rule:nonzero" /> + style="fill:#658acf;fill-rule:nonzero" /> + style="fill:#c8c7c6;fill-rule:nonzero" /> + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> - - + + + d="M 1810.9392,828.53631 L 2087.2614,828.53631 L 2334.5297,1177.7874" + stroke-miterlimit="4" + inkscape:connector-curvature="0" + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotS);marker-end:url(#Arrow2Send)" /> + transform="translate(-4,0)" + id="g6079"> + id="g6081" + clip-path="url(#clipPath6065-8)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10102-8)" /> @@ -3848,12 +30824,12 @@ + transform="translate(-4,0)" + id="g6111"> + id="g6113" + clip-path="url(#clipPath6097-0)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10104-0)" /> @@ -3874,12 +30850,12 @@ + transform="translate(-4,0)" + id="g6143"> + id="g6145" + clip-path="url(#clipPath6129-2)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10106-6)" /> @@ -3900,39 +30876,39 @@ + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + id="g6175" + clip-path="url(#clipPath6169-2)" + style="opacity:0.5"> + id="g6177" + transform="translate(2191.2754,1327.0928)"> + style="fill:#b1c7eb;fill-rule:nonzero" /> + transform="translate(4,0)" + id="g6199"> + id="g6201" + clip-path="url(#clipPath6185-2)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10108-1)" /> @@ -3953,12 +30929,12 @@ + transform="translate(4,-4)" + id="g6231"> + id="g6233" + clip-path="url(#clipPath6217-8)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10110-9)" /> @@ -3979,58 +30955,58 @@ + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + id="g6279" + clip-path="url(#clipPath6273-5)" + style="opacity:0.5"> + id="g6281" + transform="translate(2193.8848,1514.2402)"> + style="fill:#b1c7eb;fill-rule:nonzero" /> + id="g6305" + clip-path="url(#clipPath6289-4)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10112-8)" /> @@ -4051,12 +31027,12 @@ + transform="translate(0,-4)" + id="g6335"> + id="g6337" + clip-path="url(#clipPath6321-0)" + style="opacity:0.69999701"> + style="fill:url(#radialGradient10114-4)" /> @@ -4077,124 +31053,166 @@ + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + style="fill:#48484a;fill-rule:nonzero" /> + style="fill:#ffffff;fill-rule:nonzero" /> + style="fill:#2f2d2e;fill-rule:nonzero" /> + style="fill:#c8c7c6;fill-rule:nonzero" /> + style="fill:#658acf;fill-rule:nonzero" /> + style="fill:#c8c7c6;fill-rule:nonzero" /> + + + + + + + id="layer31" + inkscape:label="hexax-frame" + style="display:none" + sodipodi:insensitive="true"> + style="display:inline" + transform="matrix(0.4,0,0,0.4,495.2018,97.747949)" + id="hexa-x"> - - - - + style="opacity:0.6;fill:none;stroke:#ff0000;stroke-width:7.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:url(#DotS);marker-end:none" + d="M 470.3229,282.91329 L 504.4955,282.72845" + id="path12371" + inkscape:connector-curvature="0" /> + transform="matrix(2.1421356,1.2367625,1.2367625,-2.1421356,-5330.9322,661.46199)" + id="g19796"> + d="M 2440,1270 C 2443.33,1268.08 2447.05,1268.3 2448.32,1270.508 C 2449.59,1272.708 2447.924,1276.048 2444.6,1277.968 L 2145.6,1450.968 C 2142.28,1452.888 2138.55,1452.658 2137.28,1450.46 C 2136.01,1448.262 2137.679,1444.92 2141,1443 L 2440,1270 z" + id="path19798" /> + d="M 2440,1270 C 2443.33,1268.08 2447.05,1268.3 2448.32,1270.508 C 2449.59,1272.708 2447.924,1276.048 2444.6,1277.968 L 2145.6,1450.968 C 2142.28,1452.888 2138.55,1452.658 2137.28,1450.46 C 2136.01,1448.262 2137.679,1444.92 2141,1443 L 2440,1270 z" + id="path19800" /> + d="M 2450,1440 C 2453.33,1441.92 2454.99,1445.26 2453.72,1447.46 C 2452.45,1449.66 2448.73,1449.89 2445.4,1447.966 L 2146.4,1274.966 C 2143.08,1273.046 2141.41,1269.706 2142.68,1267.506 C 2143.95,1265.306 2147.68,1265.076 2151,1267.002 L 2450,1440.002 z" + id="path19802" /> + d="M 2450,1440 C 2453.33,1441.92 2454.99,1445.26 2453.72,1447.46 C 2452.45,1449.66 2448.73,1449.89 2445.4,1447.966 L 2146.4,1274.966 C 2143.08,1273.046 2141.41,1269.706 2142.68,1267.506 C 2143.95,1265.306 2147.68,1265.076 2151,1267.002 L 2450,1440.002 z" + id="path19804" /> + d="M 2300,1530 C 2300,1533.84 2297.94,1536.96 2295.4,1536.95 C 2292.86,1536.951 2290.8,1533.84 2290.8,1530 V 1185 C 2290.8,1181.16 2292.86,1178.05 2295.4,1178.05 C 2297.94,1178.05 2300,1181.17 2300,1185.01 L 2300,1530.01 z" + id="path19806" /> + d="M 2300,1530 C 2300,1533.84 2297.94,1536.96 2295.4,1536.95 C 2292.86,1536.951 2290.8,1533.84 2290.8,1530 V 1185 C 2290.8,1181.16 2292.86,1178.05 2295.4,1178.05 C 2297.94,1178.05 2300,1181.17 2300,1185.01 L 2300,1530.01 z" + id="path19808" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,968.3076,-983.2254)" + id="g19810"> + d="M 2310,1410 L 2312.77,1410 L 2312.77,1392.8 L 2329.97,1392.8 L 2329.97,1410 L 2333.04,1410 L 2321.54,1421.5 L 2310.04,1410 z" + id="path19812" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1056.4615,-1033.0581)" + id="g19814"> + style="opacity:0.5" + clip-path="url(#clipPath5841-3)" + id="g19816"> + transform="translate(2515.9893,1514.8203)" + id="g19818"> + d="M 0,0 C 33.2,-33.2 33.2,-87.1 -0.048,-120 C -33.248,-153.2 -87.148,-153.2 -120.048,-120 C -153.248,-86.8 -153.248,-33 -120.041,0 C -87.141,33.2 -33.241,33.2 -0.041,0" + id="path19820" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1081.1646,-940.42598)" + id="g19822"> + style="opacity:0.5" + clip-path="url(#clipPath5857-5)" + id="g19824"> + transform="translate(2355.4863,1607.2334)" + id="g19826"> + d="M 0,0 C 33.2,-33.2 33.2,-87.1 -0.047,-120 C -33.247,-153.2 -87.147,-153.2 -120.047,-120 C -153.247,-86.8 -153.247,-33 -120.039,0 C -87.139,33.2 -33.239,33.2 -0.039,0" + id="path19828" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,964.5025,-1057.7231)" + id="g19830"> + style="opacity:0.5" + clip-path="url(#clipPath5873-66)" + id="g19832"> + transform="translate(2516.0371,1330.8896)" + id="g19834"> + d="M 0,0 C 33.2,-33.2 33.2,-87.1 -0.051,-120 C -33.251,-153.2 -87.151,-153.2 -120.051,-120 C -153.251,-86.8 -153.251,-33 -120.043,0 C -87.143,33.2 -33.243,33.2 -0.043,0" + id="path19836" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,895.30485,-989.96338)" + id="g19838"> + style="opacity:0.5" + clip-path="url(#clipPath5889-3)" + id="g19840"> + transform="translate(2354.9951,1235.6455)" + id="g19842"> + d="M 0,0 C 33.2,-33.2 33.2,-87.1 -0.048,-120 C -33.248,-153.2 -87.148,-153.2 -120.048,-120 C -153.248,-86.8 -153.248,-33 -120.04,0 C -87.14,33.2 -33.24,33.2 -0.04,0" + id="path19844" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1058.4615,-1036.5222)" + id="g19846"> + style="opacity:0.69999701" + clip-path="url(#clipPath5905-9)" + id="g19848"> + d="M 2430,1450 C 2433.01,1440.23 2442.1,1433.1 2452.9,1433.1 C 2465.1,1433.1 2475.1,1442.21 2476.6,1454 H 2464.6 L 2500.2,1489.6 L 2535.8,1454 H 2524.5 C 2522.86,1422.9 2497.1,1398.2 2465.6,1398.2 C 2442,1398.19 2421.6,1412.1 2412.2,1432.2 L 2430,1450 z" + id="path19858" /> @@ -5480,12 +32488,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1058.4615,-1036.5222)" + id="g19860"> + style="opacity:0.69999701" + clip-path="url(#clipPath5937-4)" + id="g19862"> + d="M 2380,1460 C 2381.3,1491.4 2407.2,1516.5 2438.9,1516.5 C 2462.7,1516.51 2483.3,1502.4 2492.6,1482 L 2475.2,1464.6 C 2471.96,1473.95 2463.1,1480.7 2452.6,1480.7 C 2440.5,1480.71 2430.5,1471.71 2428.9,1460.1 L 2440,1460.1 L 2429.7,1449.8 L 2411.9,1432 L 2404.44,1424.54 L 2368.84,1460.14 H 2380.04 z" + id="path19872" /> @@ -5506,12 +32514,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,897.30485,-993.42748)" + id="g19874"> + style="opacity:0.69999701" + clip-path="url(#clipPath5969-7)" + id="g19876"> + d="M 2270,1170 C 2273.01,1160.22 2282.1,1153.1 2292.9,1153.1 C 2305.1,1153.1 2315.1,1162.21 2316.6,1174 H 2304.6 L 2340.2,1209.6 L 2375.8,1174 H 2364.5 C 2362.86,1142.9 2337.1,1118.2 2305.6,1118.2 C 2282,1118.189 2261.6,1132.1 2252.2,1152.2 L 2270,1170 z" + id="path19886" /> @@ -5532,12 +32540,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,897.30485,-993.42748)" + id="g19888"> + style="opacity:0.69999701" + clip-path="url(#clipPath6001-5)" + id="g19890"> + d="M 2220,1180 C 2221.3,1211.4 2247.2,1236.5 2278.9,1236.5 C 2302.7,1236.51 2323.3,1222.4 2332.6,1202 L 2315.2,1184.6 C 2311.96,1193.95 2303.1,1200.7 2292.6,1200.7 C 2280.5,1200.71 2270.5,1191.71 2268.9,1180.1 H 2280 L 2269.7,1169.8 L 2251.9,1152 L 2244.44,1144.54 L 2208.84,1180.14 H 2220.04 z" + id="path19900" /> @@ -5558,12 +32566,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,964.5025,-1057.7231)" + id="g19902"> + style="opacity:0.69999701" + clip-path="url(#clipPath6033-9)" + id="g19904"> + d="M 2480,1260 C 2476.99,1250.23 2467.9,1243.1 2457.1,1243.1 C 2444.9,1243.1 2434.9,1252.21 2433.4,1264 H 2445.4 L 2409.8,1299.6 L 2374.2,1264 H 2385.5 C 2387.14,1232.9 2412.9,1208.2 2444.4,1208.2 C 2468,1208.189 2488.4,1222.1 2497.8,1242.2 L 2480,1260 z" + id="path19914" /> @@ -5584,12 +32592,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,964.5025,-1057.7231)" + id="g19916"> + style="opacity:0.69999701" + clip-path="url(#clipPath6065-5)" + id="g19918"> + d="M 2530,1270 C 2528.7,1301.4 2502.8,1326.5 2471.1,1326.5 C 2447.3,1326.51 2426.7,1312.4 2417.4,1292 L 2434.8,1274.6 C 2438.04,1283.95 2446.9,1290.7 2457.4,1290.7 C 2469.5,1290.71 2479.5,1281.71 2481.1,1270.1 H 2470 L 2480.3,1259.8 L 2498.1,1242 L 2505.56,1234.54 L 2541.16,1270.14 H 2529.96 z" + id="path19928" /> @@ -5610,12 +32618,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1079.7005,-945.89008)" + id="g19930"> + style="opacity:0.69999701" + clip-path="url(#clipPath6097-7)" + id="g19932"> + d="M 2320,1540 C 2316.99,1530.23 2307.9,1523.1 2297.1,1523.1 C 2284.9,1523.11 2274.9,1532.21 2273.4,1544 H 2285.4 L 2249.8,1579.6 L 2214.2,1544 L 2225.5,1544.001 C 2227.14,1512.901 2252.9,1488.201 2284.4,1488.201 C 2308,1488.19 2328.4,1502.101 2337.8,1522.201 L 2320,1540.001 z" + id="path19942" /> @@ -5636,12 +32644,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1079.7005,-945.89008)" + id="g19944"> + style="opacity:0.69999701" + clip-path="url(#clipPath6129-8)" + id="g19946"> + d="M 2370,1550 C 2368.7,1581.4 2342.8,1606.5 2311.1,1606.5 C 2287.3,1606.51 2266.7,1592.4 2257.4,1572 L 2274.8,1554.6 C 2278.04,1563.95 2286.9,1570.7 2297.4,1570.7 C 2309.5,1570.71 2319.5,1561.71 2321.1,1550.1 H 2310 L 2320.3,1539.8 L 2338.1,1522 L 2345.56,1514.54 L 2381.16,1550.14 L 2369.96,1550.141 z" + id="path19956" /> @@ -5662,40 +32670,40 @@ + d="M 2301.6833,1565.5736 C 2314.5289,1562.1243 2322.1739,1548.8828 2318.7246,1536.0372 C 2315.2803,1523.1829 2302.0388,1515.5379 2289.1931,1518.9872 C 2276.3475,1522.4365 2268.7025,1535.678 2272.1518,1548.5236 C 2275.5874,1561.3729 2288.8376,1569.0229 2301.6783,1565.5823" + id="path19958" /> + d="M 2296.3628,1534.789 L 2290.9128,1544.2287 L 2289.5839,1540.9904 L 2286.749,1542.2405 L 2289.1889,1547.7945 L 2291.9862,1549.4095 L 2299.4362,1536.5057 L 2296.3791,1534.7407 z" + id="path19960" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,919.09419,-895.85226)" + id="g19962"> + style="opacity:0.5" + clip-path="url(#clipPath6169-9)" + id="g19964"> + transform="translate(2191.2754,1327.0928)" + id="g19966"> + d="M 0,0 C 33.2,-33.2 33.2,-87.1 -0.047,-120 C -33.247,-153.2 -87.147,-153.2 -120.047,-120 C -153.247,-86.8 -153.247,-33 -120.039,0 C -87.139,33.2 -33.239,33.2 -0.039,0" + id="path19968" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,924.55829,-897.31636)" + id="g19970"> + style="opacity:0.69999701" + clip-path="url(#clipPath6185-0)" + id="g19972"> + d="M 2150,1260 C 2146.99,1250.22 2137.9,1243.1 2127.1,1243.1 C 2114.9,1243.11 2104.9,1252.21 2103.4,1264 H 2115.4 L 2079.8,1299.6 L 2044.2,1264 H 2055.5 C 2057.14,1232.9 2082.9,1208.2 2114.4,1208.2 C 2138,1208.19 2158.4,1222.1 2167.8,1242.2 L 2150,1260 z" + id="path19982" /> @@ -5716,12 +32724,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,924.55829,-897.31636)" + id="g19984"> + style="opacity:0.69999701" + clip-path="url(#clipPath6217-2)" + id="g19986"> + d="M 2200,1270 C 2198.71,1301.4 2172.8,1326.5 2141.1,1326.5 C 2117.3,1326.51 2096.7,1312.4 2087.4,1292 L 2104.8,1274.6 C 2108.04,1283.95 2116.9,1290.7 2127.4,1290.7 C 2139.5,1290.71 2149.5,1281.71 2151.1,1270.1 H 2140 L 2150.3,1259.8 L 2168.1,1242 L 2175.56,1234.54 L 2211.16,1270.14 H 2199.96 z" + id="path19996" /> @@ -5742,60 +32750,60 @@ + d="M 2141.0488,1287.6603 C 2153.8944,1284.211 2161.5394,1270.9694 2158.0901,1258.1238 C 2154.6458,1245.2695 2141.4043,1237.6245 2128.5587,1241.0738 C 2115.713,1244.5231 2108.068,1257.7646 2111.5173,1270.6103 C 2114.9616,1283.4646 2128.2032,1291.1096 2141.0438,1287.6689" + id="path19998" /> + d="M 2139.1924,1258.8757 C 2136.8455,1257.5207 2134.1819,1257.6341 2132.4094,1259.3242 L 2134.6953,1261.7849 C 2135.484,1261.0509 2136.6642,1260.8547 2137.6688,1261.4347 C 2138.708,1262.0347 2139.2238,1263.1812 2138.5113,1264.4153 C 2137.6313,1265.9395 2135.9907,1265.5812 2134.7436,1264.8612 C 2133.8343,1264.3362 2132.6453,1263.3356 2131.9249,1262.4833 L 2127.9833,1270.0225 L 2135.8727,1274.5775 L 2137.3827,1271.9621 L 2132.2039,1268.9721 L 2133.2707,1266.8744 C 2133.6006,1267.185 2134.107,1267.5258 2134.488,1267.7458 C 2137.0688,1269.2358 2139.9473,1269.0502 2141.5073,1266.3482 C 2143.3123,1263.2219 2141.7287,1260.3446 2139.1999,1258.8846" + id="path20000" /> + d="M 2460.5442,1474.9993 C 2473.3899,1471.55 2481.0349,1458.3085 2477.5856,1445.4628 C 2474.1413,1432.6085 2460.8997,1424.9635 2448.0541,1428.4128 C 2435.2085,1431.8621 2427.5635,1445.1036 2431.0128,1457.9493 C 2434.4484,1470.7986 2447.6986,1478.4486 2460.5392,1475.0079" + id="path20002" /> + d="M 2452.7596,1440.4826 L 2451.2896,1443.0287 L 2453.6876,1450.4754 C 2453.9776,1451.443 2454.0491,1452.2891 2453.5996,1453.0686 C 2453.0746,1453.9779 2452.0731,1454.2426 2451.1075,1453.6851 C 2450.0855,1453.0951 2449.8807,1451.9099 2450.4138,1450.6865 L 2447.2556,1449.3966 C 2446.0466,1452.1627 2447.2556,1454.9299 2449.771,1456.3799 C 2452.1353,1457.7449 2455.1552,1457.8142 2456.7102,1455.1208 C 2457.7702,1453.2849 2457.3163,1451.591 2456.7482,1449.8544 L 2455.304,1445.4757 L 2460.5608,1448.5107 L 2462.0908,1445.8607 L 2452.7377,1440.4607 z" + id="path20004" /> + d="M 2300.8235,1195.6068 C 2313.6692,1192.1576 2321.3142,1178.916 2317.8649,1166.0704 C 2314.4206,1153.2161 2301.179,1145.5711 2288.3334,1149.0204 C 2275.4878,1152.4697 2267.8341,1165.7062 2271.2921,1178.5568 C 2274.7364,1191.4111 2287.9779,1199.0561 2300.8185,1195.6155" + id="path20006" /> + d="M 2292.2351,1174.4825 L 2292.1801,1174.4505 L 2291.873,1167.9224 L 2294.9821,1169.7174 L 2292.2321,1174.4805 z M 2299.2556,1168.8825 L 2300.7056,1166.371 L 2297.8478,1164.721 L 2296.3978,1167.2325 L 2290.3442,1163.7375 L 2288.8642,1166.301 L 2289.5987,1177.1288 L 2293.2533,1179.2388 L 2297.8083,1171.3494 L 2299.5923,1172.3794 L 2301.0223,1169.9025 L 2299.2556,1168.8825 z" + id="path20008" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1013.0175,-872.08396)" + id="g20010"> + style="opacity:0.5" + clip-path="url(#clipPath6273-8)" + id="g20012"> + transform="translate(2193.8848,1514.2402)" + id="g20014"> + d="M 0,0 C 33.2,-33.2 33.2,-87.1 -0.047,-120 C -33.247,-153.2 -87.147,-153.2 -120.047,-120 C -153.247,-86.8 -153.247,-33 -120.039,0 C -87.139,33.2 -33.239,33.2 -0.039,0" + id="path20016" /> + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1013.0175,-872.08396)" + id="g20018"> + style="opacity:0.69999701" + clip-path="url(#clipPath6289-3)" + id="g20020"> + d="M 2110,1450 C 2113.01,1440.23 2122.1,1433.1 2132.9,1433.1 C 2145.1,1433.1 2155.1,1442.21 2156.6,1454 H 2144.6 L 2180.2,1489.6 L 2215.8,1454 H 2204.5 C 2202.86,1422.9 2177.1,1398.2 2145.6,1398.2 C 2122,1398.19 2101.6,1412.1 2092.2,1432.2 L 2110,1450 z" + id="path20030" /> @@ -5816,12 +32824,12 @@ + transform="matrix(0.8660254,0.5,-0.5,0.8660254,1013.0175,-872.08396)" + id="g20032"> + style="opacity:0.69999701" + clip-path="url(#clipPath6321-6)" + id="g20034"> + d="M 2060,1460 C 2061.3,1491.4 2087.2,1516.5 2118.9,1516.5 C 2142.7,1516.5 2163.3,1502.4 2172.6,1482 L 2155.2,1464.6 C 2151.96,1473.95 2143.1,1480.7 2132.6,1480.7 C 2120.5,1480.71 2110.5,1471.71 2108.9,1460.1 H 2120 L 2109.7,1449.8 L 2091.9,1432 L 2084.44,1424.54 L 2048.84,1460.14 H 2060.04 z" + id="path20044" /> @@ -5842,6465 +32850,3508 @@ + d="M 2137.9721,1479.4375 C 2150.8177,1475.9882 2158.4714,1462.7517 2155.0134,1449.901 C 2151.5691,1437.0467 2138.3276,1429.4017 2125.482,1432.851 C 2112.6363,1436.3003 2104.9913,1449.5418 2108.4406,1462.3875 C 2111.8849,1475.2418 2125.1265,1482.8868 2137.9671,1479.4461" + id="path20046" /> + d="M 2132.1157,1457.5811 C 2130.9206,1456.8911 2130.5635,1455.5695 2131.2555,1454.3709 C 2131.8955,1453.2624 2133.2307,1452.7978 2134.4484,1453.5008 C 2135.6521,1454.1958 2135.9832,1455.5023 2135.2812,1456.7182 C 2134.6112,1457.8787 2133.316,1458.2741 2132.1157,1457.5811 M 2135.9175,1450.9541 C 2133.1202,1449.3391 2129.8126,1449.8082 2128.1876,1452.6227 C 2127.3076,1454.1469 2127.2046,1455.6694 2127.3252,1457.4365 L 2127.7592,1463.8647 L 2131.4485,1465.9947 L 2130.8275,1459.7703 L 2130.8275,1459.6478 C 2131.0115,1459.8753 2131.3628,1460.1508 2131.6529,1460.3183 C 2133.9045,1461.6183 2136.8454,1461.0646 2138.2954,1458.5531 C 2139.9854,1455.6259 2138.7005,1452.5516 2135.9205,1450.9466" + id="path20048" /> + d="M 2466.0494,1289.5215 C 2478.9037,1286.0772 2486.5487,1272.8357 2483.0907,1259.985 C 2479.6464,1247.1307 2466.4049,1239.4857 2453.5592,1242.935 C 2440.7136,1246.3843 2433.0599,1259.6209 2436.5179,1272.4715 C 2439.9622,1285.3258 2453.2037,1292.9708 2466.0444,1289.5302" + id="path20050" /> + d="M 2463.7425,1258.6545 C 2461.3956,1257.2995 2458.6839,1257.0965 2456.606,1259.0953 L 2459.0156,1261.4819 C 2459.746,1260.7627 2460.9625,1260.4697 2462.123,1261.1397 C 2462.9977,1261.6447 2463.7416,1262.6562 2463.0486,1263.8565 C 2462.2936,1265.1642 2460.7226,1264.7652 2459.4582,1264.0352 L 2458.6389,1263.5622 L 2457.3489,1265.7966 L 2458.2409,1266.3116 C 2459.3841,1266.9716 2460.3246,1267.9026 2459.6126,1269.1358 C 2459.0776,1270.0624 2458.0106,1270.1046 2457.1731,1269.6211 C 2456.2985,1269.1161 2455.9311,1268.1523 2456.2365,1267.1635 L 2453.0179,1266.1782 C 2452.3862,1268.7003 2453.7866,1270.9868 2455.9257,1272.2218 C 2458.1947,1273.5318 2461.125,1273.6763 2462.555,1271.1995 C 2463.375,1269.7792 2463.0757,1268.1976 2462.0049,1267.1522 L 2462.0359,1267.0982 C 2463.6903,1267.5927 2465.4027,1266.9867 2466.2327,1265.5491 C 2467.8627,1262.7258 2466.0986,1260.0214 2463.7343,1258.6564" + id="path20052" /> + d="M 2253.9161,1368.6254 L 2307.6963,1399.6754 C 2309.1079,1400.4904 2310.9111,1400.0072 2311.7261,1398.5956 L 2342.7761,1344.8154 C 2343.5911,1343.4038 2343.1129,1341.592 2341.7013,1340.777 L 2287.9211,1309.727 C 2286.5095,1308.912 2284.7064,1309.3951 2283.8864,1310.8154 L 2252.8364,1364.5956 C 2252.0214,1366.0072 2252.5045,1367.8104 2253.9161,1368.6254" + id="path20054" /> + d="M 2293.4328,1352.1805 L 2295.7253,1342.6499 L 2303.896,1342.8177 L 2300.8988,1353.789 L 2293.4228,1352.1978 z M 2283.4326,1365.9213 L 2286.9586,1353.7542 L 2289.0285,1354.089 L 2300.6264,1356.2009 L 2298.2708,1366.2609 L 2283.4774,1365.8837 z M 2287.9177,1383.7529 C 2286.9108,1383.1969 2286.2638,1382.2576 2286.5924,1380.8284 L 2289.8937,1367.0305 L 2297.2892,1367.2011 L 2294.4141,1377.7809 C 2294.4821,1379.2518 2295.7055,1379.4041 2297.1437,1379.3731 L 2308.6225,1378.6911 C 2309.7073,1378.5103 2310.665,1377.9535 2311.3767,1376.6208 L 2315.059,1369.0589 C 2315.5511,1367.9805 2315.2886,1367.0091 2314.7625,1366.8323 L 2297.4839,1366.3597 L 2300.2543,1356.1813 L 2304.1286,1356.8708 L 2304.1386,1356.8608 L 2320.0472,1359.7064 C 2322.4169,1360.1219 2322.9238,1363.284 2321.1231,1366.5629 L 2314.4794,1378.2001 C 2312.7819,1381.0422 2310.5091,1381.7969 2308.4785,1382.114 L 2292.5299,1384.3377 C 2291.1794,1384.5568 2289.2387,1384.4582 2287.921,1383.7205" + id="path20056" /> + d="M 2281.2367,1361.3049 L 2279.7242,1361.3046 L 2278.5987,1365.5738 L 2275.275,1365.4908 L 2271.0678,1359.8979 L 2262.1938,1357.4881 L 2271.7104,1356.8048 L 2278.0901,1351.9549 L 2282.2142,1352.8118 L 2280.9354,1357.5467 L 2282.1072,1357.997 L 2281.2368,1361.3165 z" + id="path20058" /> + d="M 2324.2174,1346.86 L 2326.4344,1348.14 C 2326.6769,1348.28 2326.921,1348.2973 2327.1848,1348.23 C 2327.3163,1348.204 2327.4367,1348.146 2327.528,1348.0656 C 2327.6312,1347.9886 2327.7246,1347.895 2327.7951,1347.7729 L 2328.2521,1346.9814 C 2328.3201,1346.8644 2328.3557,1346.734 2328.376,1346.5968 C 2328.396,1346.4846 2328.386,1346.3588 2328.339,1346.2312 C 2328.267,1345.9657 2328.1291,1345.7648 2327.8866,1345.6248 L 2325.6696,1344.3448 C 2325.4315,1344.2073 2325.1806,1344.1837 2324.9208,1344.2578 C 2324.7863,1344.2828 2324.6738,1344.3358 2324.577,1344.4034 C 2324.478,1344.4954 2324.3786,1344.589 2324.3111,1344.706 L 2323.8541,1345.4975 C 2323.7841,1345.6196 2323.7533,1345.75 2323.729,1345.8722 C 2323.715,1345.9967 2323.719,1346.1284 2323.767,1346.2566 C 2323.835,1346.5151 2323.9797,1346.7223 2324.2178,1346.8598 M 2313.4791,1340.6598 L 2315.6961,1341.9398 C 2315.936,1342.0783 2316.1809,1342.0961 2316.4413,1342.0268 C 2316.7002,1341.9598 2316.9211,1341.8119 2317.0586,1341.5737 L 2317.5156,1340.7822 C 2317.6541,1340.5423 2317.6772,1340.2681 2317.5956,1340.028 C 2317.5326,1339.7697 2317.39,1339.5641 2317.1597,1339.4311 L 2314.068,1337.6461 L 2313.572,1338.5052 L 2313.3115,1338.9564 L 2313.115,1339.2967 C 2313.044,1339.4188 2313.0108,1339.5472 2312.9942,1339.6739 C 2312.9812,1339.7989 2312.9942,1339.9341 2313.0352,1340.0598 C 2313.0922,1340.3123 2313.2357,1340.5185 2313.479,1340.659 M 2300.4887,1333.159 L 2302.697,1334.434 C 2302.9456,1334.5775 2303.1896,1334.5948 2303.4535,1334.528 C 2303.5797,1334.499 2303.6959,1334.438 2303.7941,1334.3621 C 2303.899,1334.2861 2303.9881,1334.19 2304.0546,1334.0748 L 2300.1228,1331.8048 C 2300.0568,1331.92 2300.0209,1332.0474 2300.0035,1332.1736 C 2299.9895,1332.2981 2299.9935,1332.4293 2300.0355,1332.5545 C 2300.1045,1332.8135 2300.2559,1333.0247 2300.4897,1333.1597 M 2293.9859,1329.4047 L 2296.1856,1330.6747 C 2296.4289,1330.8152 2296.6885,1330.8415 2296.9533,1330.775 C 2297.2174,1330.712 2297.4096,1330.5466 2297.5471,1330.3084 L 2298.0041,1329.5169 C 2298.1426,1329.277 2298.1944,1329.0193 2298.1073,1328.7762 C 2298.0343,1328.5102 2297.8809,1328.3003 2297.6376,1328.1598 L 2296.0008,1327.2148 L 2294.5805,1326.3948 L 2294.0845,1327.2539 L 2293.824,1327.7051 L 2293.6275,1328.0454 C 2293.5575,1328.1675 2293.5103,1328.2884 2293.4972,1328.4171 C 2293.4972,1328.5476 2293.4972,1328.6803 2293.5352,1328.8015 C 2293.5962,1329.056 2293.7495,1329.2682 2293.9929,1329.4087 M 2287.4804,1325.6487 L 2289.6801,1326.9187 C 2289.92,1327.0572 2290.1857,1327.087 2290.4435,1327.0167 C 2290.5637,1326.9847 2290.6789,1326.9227 2290.7858,1326.8518 C 2290.889,1326.7748 2290.9729,1326.6757 2291.0434,1326.5536 L 2291.5004,1325.7621 C 2291.5684,1325.6451 2291.6135,1325.5202 2291.6338,1325.383 C 2291.6338,1325.2618 2291.6338,1325.139 2291.5978,1325.0179 C 2291.5318,1324.7559 2291.3723,1324.5425 2291.1324,1324.404 L 2290.857,1324.245 L 2288.9344,1323.135 C 2288.6902,1322.994 2288.4359,1322.9684 2288.1674,1323.037 C 2288.0519,1323.073 2287.9351,1323.123 2287.8366,1323.1901 C 2287.7236,1323.2741 2287.6425,1323.3782 2287.575,1323.4952 L 2287.118,1324.2867 C 2287.048,1324.4088 2286.9991,1324.5287 2286.9886,1324.6589 C 2286.9766,1324.7844 2286.9886,1324.9186 2287.0136,1325.0358 C 2287.0896,1325.2993 2287.2384,1325.5085 2287.4826,1325.6495 M 2323.6821,1347.7502 C 2323.4405,1347.6107 2323.2363,1347.4362 2323.0757,1347.2084 C 2322.9188,1347.0162 2322.8053,1346.7728 2322.7497,1346.5352 C 2322.6767,1346.275 2322.6587,1346.0141 2322.6807,1345.7425 C 2322.7147,1345.469 2322.8186,1345.2217 2322.9551,1344.9853 L 2323.4201,1344.1799 C 2323.5606,1343.9365 2323.723,1343.7231 2323.9397,1343.5619 C 2324.162,1343.4108 2324.3949,1343.2993 2324.6556,1343.2339 C 2324.8892,1343.1629 2325.1567,1343.1399 2325.4046,1343.1749 C 2325.6812,1343.2019 2325.9324,1343.2948 2326.174,1343.4343 L 2328.5036,1344.7793 C 2328.7435,1344.9178 2328.9514,1345.0898 2329.1086,1345.3134 C 2329.266,1345.5128 2329.3813,1345.7571 2329.4473,1346.0008 C 2329.5163,1346.2567 2329.5353,1346.5137 2329.5113,1346.7788 C 2329.4713,1347.042 2329.3825,1347.2979 2329.242,1347.5413 L 2328.777,1348.3467 C 2328.6405,1348.5831 2328.4633,1348.7879 2328.2523,1348.9594 C 2328.0332,1349.117 2327.7991,1349.2324 2327.5418,1349.3021 C 2327.2978,1349.3671 2327.0285,1349.3891 2326.7801,1349.3471 C 2326.5069,1349.3241 2326.252,1349.2339 2326.0121,1349.0954 L 2323.6825,1347.7504 z M 2299.953,1334.0502 C 2299.7148,1333.9127 2299.5098,1333.7377 2299.3449,1333.5074 C 2299.1845,1333.3132 2299.0753,1333.0723 2299.0145,1332.8317 C 2298.9475,1332.575 2298.9235,1332.3101 2298.9525,1332.043 C 2298.9855,1331.7708 2299.0714,1331.5251 2299.2099,1331.2852 L 2299.6749,1330.4798 C 2299.8134,1330.2399 2299.987,1330.0353 2300.2075,1329.8693 C 2300.4231,1329.712 2300.6659,1329.5993 2300.9205,1329.5304 C 2301.1593,1329.4624 2301.4225,1329.4374 2301.6739,1329.4734 C 2301.9548,1329.5024 2302.2068,1329.5963 2302.445,1329.7338 L 2306.0044,1331.7888 L 2305.4844,1332.6895 L 2301.977,1330.6645 C 2301.7431,1330.5295 2301.4854,1330.5019 2301.2247,1330.5755 C 2301.1216,1330.6065 2301.0295,1330.6475 2300.9403,1330.7081 C 2300.8433,1330.7631 2300.76,1330.8384 2300.6962,1330.917 L 2305.5719,1333.732 L 2305.0419,1334.65 C 2304.9034,1334.8898 2304.7303,1335.0855 2304.5238,1335.2573 C 2304.2995,1335.4118 2304.0723,1335.5313 2303.8081,1335.5969 C 2303.5615,1335.6599 2303.2957,1335.6849 2303.0404,1335.6389 C 2302.7801,1335.6239 2302.5252,1335.5331 2302.2723,1335.3871 L 2299.9514,1334.0471 z M 2286.9626,1326.5502 C 2286.7115,1326.4052 2286.5065,1326.2302 2286.3597,1326.0104 C 2286.1864,1325.8087 2286.0824,1325.5708 2286.0103,1325.3237 C 2285.9463,1325.0685 2285.9233,1324.8046 2285.9513,1324.5365 C 2285.9913,1324.2665 2286.0788,1324.0097 2286.2153,1323.7733 L 2286.6803,1322.9679 C 2286.8208,1322.7245 2286.9997,1322.5206 2287.2103,1322.3559 C 2287.4266,1322.2013 2287.6647,1322.0928 2287.9167,1322.0224 C 2288.1668,1321.9614 2288.4248,1321.9324 2288.6891,1321.9764 C 2288.9519,1321.9954 2289.2039,1322.0888 2289.455,1322.2338 L 2291.1957,1323.2388 L 2291.7708,1323.5708 L 2294.1956,1324.9708 L 2295.1906,1323.2474 L 2296.1519,1323.8024 L 2295.1569,1325.5258 L 2295.9606,1325.9898 L 2296.2724,1326.1698 L 2298.2815,1327.3298 C 2298.5266,1327.4713 2298.7302,1327.6408 2298.8796,1327.8599 C 2299.0517,1328.0678 2299.1566,1328.3061 2299.2339,1328.5563 C 2299.3069,1328.8142 2299.3219,1329.0692 2299.2899,1329.3298 C 2299.2519,1329.594 2299.1697,1329.8539 2299.0292,1330.0973 L 2298.5642,1330.9027 C 2298.4277,1331.1391 2298.2436,1331.3399 2298.0309,1331.5104 C 2297.8196,1331.6725 2297.589,1331.7899 2297.3282,1331.8576 C 2297.0729,1331.9156 2296.814,1331.9436 2296.5509,1331.8936 C 2296.2855,1331.8756 2296.0349,1331.7874 2295.7898,1331.6459 L 2293.4689,1330.3059 C 2293.2255,1330.1654 2293.0214,1329.9909 2292.8651,1329.7656 C 2292.6987,1329.5679 2292.5921,1329.3285 2292.52,1329.0814 C 2292.453,1328.8242 2292.429,1328.5603 2292.465,1328.2967 C 2292.498,1328.0227 2292.5821,1327.7639 2292.7186,1327.5275 L 2293.6736,1325.8734 L 2292.7902,1325.3634 C 2292.7802,1325.4304 2292.7802,1325.5068 2292.7702,1325.57 C 2292.7432,1325.8408 2292.6561,1326.0977 2292.5156,1326.341 L 2292.0506,1327.1464 C 2291.9141,1327.3829 2291.7352,1327.5867 2291.5112,1327.7507 C 2291.3094,1327.9182 2291.0684,1328.0297 2290.8189,1328.1038 C 2290.5636,1328.1618 2290.3004,1328.1878 2290.0434,1328.1408 C 2289.7666,1328.1158 2289.5135,1328.0265 2289.2701,1327.886 L 2286.9492,1326.546 z M 2320.1965,1339.9874 L 2321.1491,1340.5374 L 2318.6491,1344.8675 L 2317.6965,1344.3175 L 2320.1965,1339.9874 z M 2306.4382,1337.8175 C 2306.2018,1337.681 2306.0009,1337.4969 2305.8442,1337.2644 C 2305.6907,1337.0742 2305.5789,1336.8318 2305.5129,1336.5881 C 2305.4459,1336.3315 2305.4249,1336.0685 2305.4479,1335.798 C 2305.4909,1335.5317 2305.5815,1335.2885 2305.72,1335.0487 L 2307.2,1332.4852 L 2308.144,1333.0302 L 2306.669,1335.585 C 2306.5325,1335.8214 2306.5095,1336.0853 2306.575,1336.3473 C 2306.599,1336.4652 2306.668,1336.5831 2306.7309,1336.6832 C 2306.8099,1336.7888 2306.9044,1336.8688 2307.023,1336.9373 L 2309.2487,1338.2223 C 2309.363,1338.2883 2309.4875,1338.3348 2309.6053,1338.3427 C 2309.7375,1338.3557 2309.8781,1338.3577 2309.9837,1338.3157 C 2310.2513,1338.2457 2310.4622,1338.0908 2310.5987,1337.8544 L 2312.0737,1335.2996 L 2312.3387,1335.4526 L 2313.0186,1335.8451 L 2313.6923,1336.2341 L 2314.6873,1334.5107 L 2315.64,1335.0607 L 2314.645,1336.7841 L 2315.4478,1337.2476 L 2317.4396,1338.3976 L 2317.7921,1338.6011 C 2318.0216,1338.7336 2318.2295,1338.9056 2318.3893,1339.1307 C 2318.5415,1339.3271 2318.6568,1339.5715 2318.7228,1339.8151 C 2318.7888,1340.0691 2318.8158,1340.3305 2318.7868,1340.5936 C 2318.7518,1340.8599 2318.651,1341.1087 2318.5105,1341.3521 L 2318.0455,1342.1575 C 2317.909,1342.3939 2317.744,1342.6058 2317.5278,1342.7742 C 2317.3121,1342.9338 2317.0702,1343.0447 2316.8164,1343.1164 C 2316.5724,1343.1814 2316.3031,1343.2034 2316.0599,1343.1644 C 2315.7841,1343.1404 2315.5292,1343.0497 2315.2997,1342.9172 L 2312.9528,1341.5622 C 2312.7111,1341.4227 2312.507,1341.2483 2312.3499,1341.0224 C 2312.199,1340.8337 2312.0916,1340.5939 2312.0186,1340.3462 C 2311.9496,1340.088 2311.9276,1339.8251 2311.9506,1339.554 C 2311.9916,1339.2846 2312.0807,1339.0287 2312.2172,1338.7923 L 2313.1722,1337.1382 L 2312.4984,1336.7492 L 2311.5434,1338.4033 L 2311.5434,1338.4133 C 2311.4049,1338.6531 2311.231,1338.8483 2311.0305,1339.0236 C 2310.8053,1339.1776 2310.5721,1339.2936 2310.3148,1339.3632 C 2310.0665,1339.4252 2309.7972,1339.4482 2309.548,1339.4052 C 2309.2873,1339.3952 2309.0265,1339.3142 2308.7832,1339.1738 L 2306.4449,1337.8238 z M 2327.8934,1351.8559 L 2328.5034,1350.7993 L 2328.0791,1350.5543 L 2328.6041,1349.645 L 2329.0284,1349.89 L 2330.0934,1348.0454 C 2330.2339,1347.802 2330.4198,1347.6022 2330.6243,1347.4339 C 2330.8432,1347.2808 2331.0709,1347.1664 2331.3255,1347.0974 C 2331.5825,1347.0404 2331.8379,1347.0104 2332.1031,1347.0544 C 2332.3642,1347.0724 2332.617,1347.1663 2332.869,1347.3118 L 2333.5541,1347.7073 L 2333.0341,1348.608 L 2332.3612,1348.2195 C 2332.1148,1348.1061 2331.8602,1348.0792 2331.6261,1348.1645 C 2331.504,1348.1845 2331.3851,1348.2455 2331.289,1348.3244 C 2331.194,1348.3904 2331.1167,1348.4928 2331.0502,1348.608 L 2329.9902,1350.444 L 2331.4798,1351.304 L 2331.3683,1351.4971 L 2330.9533,1352.2159 L 2329.4637,1351.3559 L 2328.8537,1352.4124 L 2327.8924,1351.8574 z M 2318.2589,1346.9435 L 2320.7389,1342.648 C 2320.8774,1342.4081 2321.0613,1342.2095 2321.2767,1342.0405 C 2321.4853,1341.8792 2321.7151,1341.759 2321.9711,1341.7036 C 2322.2333,1341.6436 2322.4818,1341.6146 2322.7612,1341.6546 C 2323.0222,1341.6726 2323.2664,1341.7616 2323.5141,1341.9046 L 2323.7055,1342.0151 L 2323.1855,1342.9158 L 2323.0114,1342.8153 C 2322.772,1342.7059 2322.533,1342.688 2322.2764,1342.7603 C 2322.1612,1342.7843 2322.0449,1342.8473 2321.9514,1342.9271 C 2321.8435,1342.9861 2321.7765,1343.0941 2321.71,1343.2092 L 2319.23,1347.5047 L 2318.2601,1346.9447 z M 2317.1981,1345.0608 L 2318.1507,1345.6108 L 2317.6007,1346.5635 L 2316.6481,1346.0135 L 2317.1981,1345.0608 z" + id="path20060" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + sodipodi:nodetypes="cccc" /> + sodipodi:nodetypes="cccc" /> + stroke-miterlimit="4" + d="M 470.3229,324.24379 L 504.4955,324.76199 M 611.9955,324.24379 L 900.48286,324.24379 L 982.43382,234.07311" + id="path19792" /> + stroke-miterlimit="4" + d="M 470.3229,124.47969 L 764.4955,123.9243 L 764.4955,-77.805374 L 1490.5185,-76.213574 L 1491.0211,115.9054" + id="path19786" /> + stroke-miterlimit="4" + d="M 470.3229,163.05484 L 718.623,162.87055 L 718.623,138.6481 M 718.622,100.44502 L 716.8843,-120.50867 L 1732.1087,-118.61107 L 1733.5546,504.86806" + id="path19788" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Spectrum - Satellite - - - - - - - - - - - - Futaba - S-Bus - - - - - - - - - - - - PPM Signal - - - - - - - - - - - - - - - - - Throttle - Roll - Pitch - Yaw - Flight Mode - - + stroke-miterlimit="4" + d="M 470.3229,204.38534 L 553.9805,204.38534 L 556.1914,749.2282 L 1441.0819,965.31207" + id="path19790" /> + + + From b0e337c540cd0b9088bc89cae6abc77b28989911 Mon Sep 17 00:00:00 2001 From: m_thread Date: Thu, 25 Sep 2014 23:16:13 +0200 Subject: [PATCH 2/4] OP-1222 Added UUID to template file for identification. Implemented the code to apply the template settings. Fixed tab order in template export dialog. Extended support for parsing and applying json data in uavobjectmanager. --- .../pages/airframeinitialtuningpage.cpp | 32 +++++++++---------- .../vehicleconfigurationhelper.cpp | 18 +++++++++++ .../setupwizard/vehicleconfigurationhelper.h | 1 + .../vehicletemplateexportdialog.cpp | 7 ++-- .../vehicletemplateexportdialog.ui | 19 +++++++++++ .../plugins/uavobjects/uavobjectmanager.cpp | 5 ++- .../src/plugins/uavobjects/uavobjectmanager.h | 2 +- 7 files changed, 63 insertions(+), 21 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp index bae342554..d3383f07c 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp @@ -82,6 +82,9 @@ bool AirframeInitialTuningPage::validatePage() if (ui->templateList->currentRow() >= 0) { templ = ui->templateList->item(ui->templateList->currentRow())->data(Qt::UserRole + 1).value(); } + if (getWizard()->getVehicleTemplate() != NULL) { + delete getWizard()->getVehicleTemplate(); + } getWizard()->setVehicleTemplate(new QJsonObject(*templ)); return true; } @@ -114,8 +117,11 @@ void AirframeInitialTuningPage::updateDescription(QJsonObject *templ) if (templ != NULL) { QString description; description.append("").append(tr("Name of Vehicle: ")).append("").append(templ->value("name").toString()).append("
"); - description.append("").append(tr("Name of Owner: ")).append("").append(templ->value("owner").toString()) - .append(" (").append(templ->value("nick").toString()).append(")").append("
"); + description.append("").append(tr("Name of Owner: ")).append("").append(templ->value("owner").toString()); + if (templ->value("nick") != "") { + description.append(" (").append(templ->value("nick").toString()).append(")"); + } + description.append("
"); description.append("").append(tr("Size: ")).append("").append(templ->value("size").toString()).append("
"); description.append("").append(tr("Weight: ")).append("").append(templ->value("weight").toString()).append("
"); description.append("").append(tr("Motor(s): ")).append("").append(templ->value("motor").toString()).append("
"); @@ -156,26 +162,19 @@ void AirframeInitialTuningPage::loadValidFiles() QStringList files = templateDir.entryList(); foreach(QString fileName, files) { QFile file(QString("%1/%2").arg(templateDir.absolutePath()).arg(fileName)); - if (file.open(QFile::ReadOnly)) { QByteArray jsonData = file.readAll(); QJsonDocument templateDoc = QJsonDocument::fromJson(jsonData); QJsonObject json = templateDoc.object(); if (json["type"].toInt() == getWizard()->getVehicleType() && json["subtype"].toInt() == getWizard()->getVehicleSubType()) { - QString nameKey = getTemplateKey(&json); - int index = 0; - while (true) { - if (!m_templates.contains(nameKey)) { - m_templates[nameKey] = new QJsonObject(json); - break; - } else { - nameKey = QString("%1 - %2").arg(nameKey).arg(++index); - } + QString uuid = json["uuid"].toString(); + if (!m_templates.contains(uuid)) { + m_templates[json["uuid"].toString()] = new QJsonObject(json); } } - file.close(); } + file.close(); } } @@ -185,15 +184,16 @@ void AirframeInitialTuningPage::setupTemplateList() item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL)); foreach(QString templ, m_templates.keys()) { - item = new QListWidgetItem(templ, ui->templateList); - item->setData(Qt::UserRole + 1, QVariant::fromValue(m_templates[templ])); + QJsonObject *json = m_templates[templ]; + item = new QListWidgetItem(json->value("name").toString(), ui->templateList); + item->setData(Qt::UserRole + 1, QVariant::fromValue(json)); } ui->templateList->setCurrentRow(0); } QString AirframeInitialTuningPage::getTemplateKey(QJsonObject *templ) { - return QString("%1 - %2").arg(templ->value("nick").toString()).arg(templ->value("name").toString()); + return QString(templ->value("name").toString()); } void AirframeInitialTuningPage::resizeEvent(QResizeEvent *) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index d1155a74d..2cfa8df32 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -42,6 +42,7 @@ #include "gpssettings.h" #include "airspeedsettings.h" #include +#include const qint16 VehicleConfigurationHelper::LEGACY_ESC_FREQUENCE = 50; const qint16 VehicleConfigurationHelper::RAPID_ESC_FREQUENCE = 400; @@ -82,6 +83,8 @@ bool VehicleConfigurationHelper::setupVehicle(bool save) applyStabilizationConfiguration(); applyManualControlDefaults(); + applyTemplateSettings(); + bool result = saveChangesToController(save); emit saveProgress(m_modifiedObjects.count() + 1, ++m_progress, result ? tr("Done!") : tr("Failed!")); return result; @@ -747,6 +750,21 @@ void VehicleConfigurationHelper::applyManualControlDefaults() addModifiedObject(mcSettings, tr("Writing manual control defaults")); } +void VehicleConfigurationHelper::applyTemplateSettings() +{ + if (m_configSource->getVehicleTemplate() != NULL) { + QJsonObject* json = m_configSource->getVehicleTemplate(); + QList updatedObjects; + m_uavoManager->fromJson(*json, &updatedObjects); + foreach (UAVObject* object, updatedObjects) { + UAVDataObject *dataObj = dynamic_cast(object); + if (dataObj != NULL) { + addModifiedObject(dataObj, QString(tr("Writing template settings for %1")).arg(object->getName())); + } + } + } +} + bool VehicleConfigurationHelper::saveChangesToController(bool save) { qDebug() << "Saving modified objects to controller. " << m_modifiedObjects.count() << " objects in found."; diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h index 5b692c30c..750697a41 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h @@ -87,6 +87,7 @@ private: void applySensorBiasConfiguration(); void applyStabilizationConfiguration(); void applyManualControlDefaults(); + void applyTemplateSettings(); void applyMixerConfiguration(mixerChannelSettings channels[]); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp index 92c5c6486..9e85e5158 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp @@ -199,6 +199,8 @@ void VehicleTemplateExportDialog::accept() exportObject["propeller"] = ui->Propeller->text(); exportObject["controller"] = ui->Controllers->currentText(); exportObject["comment"] = ui->Comment->document()->toPlainText(); + QUuid uuid = QUuid::createUuid(); + exportObject["uuid"] = uuid.toString(); QByteArray bytes; QBuffer buffer(&bytes); @@ -209,13 +211,12 @@ void VehicleTemplateExportDialog::accept() QJsonDocument saveDoc(exportObject); - QString fileName = QString("%1/%2/%3-%4-%5-%6.optmpl") + QString fileName = QString("%1/%2/%3-%4-%5.optmpl") .arg(EXPORT_BASE_NAME) .arg(getTypeDirectory()) - .arg(fixFilenameString(ui->ForumNick->text(), 15)) .arg(fixFilenameString(ui->Name->text(), 20)) .arg(fixFilenameString(ui->Type->text(), 30)) - .arg(fixFilenameString(QUuid::createUuid().toString().right(12))); + .arg(fixFilenameString(uuid.toString().right(12))); QFile saveFile(fileName); QDir dir; dir.mkpath(QFileInfo(saveFile).absoluteDir().absolutePath()); diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui index db58e94f4..4711d3fe5 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.ui @@ -540,6 +540,25 @@ + + Type + Name + Owner + ForumNick + Size + Weight + Motor + Esc + Servo + Battery + Propeller + Controllers + Comment + ImportButton + acceptBtn + cancelBtn + Photo + diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.cpp b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.cpp index 8683f905b..a90b18dd6 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.cpp +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.cpp @@ -340,7 +340,7 @@ void UAVObjectManager::toJson(QJsonObject &jsonObject, const QList jsonObject["objects"] = jObjects; } -void UAVObjectManager::fromJson(const QJsonObject &jsonObject) +void UAVObjectManager::fromJson(const QJsonObject &jsonObject, QList *updatedObjects) { QJsonArray jObjects = jsonObject["objects"].toArray(); @@ -349,6 +349,9 @@ void UAVObjectManager::fromJson(const QJsonObject &jsonObject) UAVObject *object = getObject(jObject["name"].toString(), jObject["instance"].toInt()); if (object != NULL) { object->fromJson(jObject); + if (updatedObjects != NULL) { + updatedObjects->append(object); + } } } } diff --git a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.h b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.h index cc6460abe..c65e54e71 100644 --- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.h +++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectmanager.h @@ -59,7 +59,7 @@ public: void toJson(QJsonObject &jsonObject, JSON_EXPORT_OPTION what = JSON_EXPORT_ALL); void toJson(QJsonObject &jsonObject, const QList &objectsToExport); void toJson(QJsonObject &jsonObject, const QList &objectsToExport); - void fromJson(const QJsonObject &jsonObject); + void fromJson(const QJsonObject &jsonObject, QList *updatedObjects = NULL); signals: void newObject(UAVObject *obj); From 8d76e6f6715c3dacc9fba8deac1597f3da2619f5 Mon Sep 17 00:00:00 2001 From: m_thread Date: Thu, 25 Sep 2014 23:19:50 +0200 Subject: [PATCH 3/4] OP-1222 Uncrustified code. --- .../setupwizard/pages/airframeinitialtuningpage.cpp | 2 ++ .../plugins/setupwizard/vehicleconfigurationhelper.cpp | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp index d3383f07c..a8fcb3dca 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp @@ -162,6 +162,7 @@ void AirframeInitialTuningPage::loadValidFiles() QStringList files = templateDir.entryList(); foreach(QString fileName, files) { QFile file(QString("%1/%2").arg(templateDir.absolutePath()).arg(fileName)); + if (file.open(QFile::ReadOnly)) { QByteArray jsonData = file.readAll(); QJsonDocument templateDoc = QJsonDocument::fromJson(jsonData); @@ -185,6 +186,7 @@ void AirframeInitialTuningPage::setupTemplateList() item->setData(Qt::UserRole + 1, QVariant::fromValue((QJsonObject *)NULL)); foreach(QString templ, m_templates.keys()) { QJsonObject *json = m_templates[templ]; + item = new QListWidgetItem(json->value("name").toString(), ui->templateList); item->setData(Qt::UserRole + 1, QVariant::fromValue(json)); } diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp index 2cfa8df32..f8e7c29a7 100644 --- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp +++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp @@ -753,11 +753,12 @@ void VehicleConfigurationHelper::applyManualControlDefaults() void VehicleConfigurationHelper::applyTemplateSettings() { if (m_configSource->getVehicleTemplate() != NULL) { - QJsonObject* json = m_configSource->getVehicleTemplate(); - QList updatedObjects; + QJsonObject *json = m_configSource->getVehicleTemplate(); + QList updatedObjects; m_uavoManager->fromJson(*json, &updatedObjects); - foreach (UAVObject* object, updatedObjects) { - UAVDataObject *dataObj = dynamic_cast(object); + foreach(UAVObject * object, updatedObjects) { + UAVDataObject *dataObj = dynamic_cast(object); + if (dataObj != NULL) { addModifiedObject(dataObj, QString(tr("Writing template settings for %1")).arg(object->getName())); } From 045757a6bb52c1d7b834a66b0a6f42b0b4cff581 Mon Sep 17 00:00:00 2001 From: Fredrik Larsson Date: Fri, 26 Sep 2014 08:47:42 +1000 Subject: [PATCH 4/4] Back to 2K --- shared/uavobjectdefinition/mpu6000settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared/uavobjectdefinition/mpu6000settings.xml b/shared/uavobjectdefinition/mpu6000settings.xml index 59d469c78..943243fa7 100644 --- a/shared/uavobjectdefinition/mpu6000settings.xml +++ b/shared/uavobjectdefinition/mpu6000settings.xml @@ -1,7 +1,7 @@ Settings for the @ref MPU6000 sensor used on CC3D and Revolution. Reboot the board for this to takes effect - +