diff --git a/ground/gcs/src/plugins/setupwizard/connectiondiagram.cpp b/ground/gcs/src/plugins/setupwizard/connectiondiagram.cpp
index c6f8b1d69..4038cb4d6 100644
--- a/ground/gcs/src/plugins/setupwizard/connectiondiagram.cpp
+++ b/ground/gcs/src/plugins/setupwizard/connectiondiagram.cpp
@@ -2,7 +2,8 @@
******************************************************************************
*
* @file connectiondiagram.cpp
- * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
+ * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
+ * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @addtogroup
* @{
* @addtogroup ConnectionDiagram
@@ -82,9 +83,11 @@ void ConnectionDiagram::setupGraphicsScene()
switch (m_configSource->getControllerType()) {
case VehicleConfigurationSource::CONTROLLER_CC:
- case VehicleConfigurationSource::CONTROLLER_CC3D:
elementsToShow << "controller-cc";
break;
+ case VehicleConfigurationSource::CONTROLLER_CC3D:
+ elementsToShow << "controller-cc3d";
+ break;
case VehicleConfigurationSource::CONTROLLER_REVO:
elementsToShow << "controller-revo";
break;
diff --git a/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp b/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp
index 354aa868a..6ed9a5a33 100644
--- a/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp
+++ b/ground/gcs/src/plugins/setupwizard/pages/controllerpage.cpp
@@ -2,7 +2,8 @@
******************************************************************************
*
* @file controllerpage.cpp
- * @author The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
+ * @author The LibrePilot Project, http://www.librepilot.org Copyright (C) 2015.
+ * The OpenPilot Team, http://www.openpilot.org Copyright (C) 2012.
* @addtogroup
* @{
* @addtogroup ControllerPage
diff --git a/ground/gcs/src/plugins/setupwizard/resources/connection-diagrams.svg b/ground/gcs/src/plugins/setupwizard/resources/connection-diagrams.svg
index 6f6f466c3..8bc133ea2 100644
--- a/ground/gcs/src/plugins/setupwizard/resources/connection-diagrams.svg
+++ b/ground/gcs/src/plugins/setupwizard/resources/connection-diagrams.svg
@@ -30,13 +30,13 @@
inkscape:window-height="928"
id="namedview4616"
showgrid="false"
- inkscape:zoom="3.1437357"
- inkscape:cx="491.77294"
- inkscape:cy="464.53459"
+ inkscape:zoom="0.56829069"
+ inkscape:cx="617.05784"
+ inkscape:cy="502.76029"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
- inkscape:current-layer="layer51"
+ inkscape:current-layer="svg12651"
fit-margin-top="15"
fit-margin-left="15"
fit-margin-right="15"
@@ -17811,6 +17811,12 @@
y1="1060"
x2="843"
y2="669" />
+
@@ -17852,12 +17858,12 @@
inkscape:groupmode="layer"
id="layer52"
inkscape:label="cc-pwm"
- style="display:none"
+ style="display:inline"
sodipodi:insensitive="true">
+ transform="translate(2.9999998,1.0000001)">
+ style="display:none"
+ sodipodi:insensitive="true">
+ transform="translate(3.9999998,1.0000001)">
+ transform="translate(1,-2)">
+ transform="matrix(0,0.4,-0.4,0,931.4684,-115.45414)">
+ transform="matrix(0.4,0,0,0.4,-129.04473,-95.93132)">
+ style="display:inline"
+ sodipodi:insensitive="true">
@@ -26586,7 +26594,7 @@
width="11.311534"
y="-8.3449402"
x="602.16431"
- style="fill:#e9dcdc;display:inline"
+ style="display:inline;fill:#e9dcdc"
inkscape:transform-center-x="-52.764729"
inkscape:transform-center-y="43.141303" />
@@ -26644,7 +26652,7 @@
height="127.94168"
width="102.65967"
id="rect4057"
- style="opacity:0.87969923;fill:#0f62a8;fill-opacity:1;stroke:#6c6b6f;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="opacity:0.87969923;fill:#0f62a8;fill-opacity:1;stroke:#6c6b6f;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:url(#linearGradient4376-5-7);fill-opacity:1;stroke:#3d3d3e;stroke-width:0.73051065;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
MS4525
@@ -27004,54 +27012,54 @@
+ points="251.619,480.095 251.619,473.728 242.74,473.728 242.74,467.777 251.619,467.777 251.619,467.777 251.619,460.783 233.13,460.783 233.13,492.937 251.619,492.937 251.619,485.734 242.74,485.734 242.74,480.095 " />
+ points="220.283,364.946 220.283,364.946 253.082,364.946 253.082,454.937 220.283,454.937 " />
+ points="225.505,370.688 225.505,370.688 225.505,449.298 247.754,449.298 247.754,370.688 " />
@@ -27070,18 +27078,18 @@
+ d="m 236.04807,500.42627 l -56.53253,0"
+ style="fill:none;stroke:#545253;stroke-width:9.10000038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="m 236.04807,504.14551 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -27090,22 +27098,22 @@
id="g6553"
transform="matrix(0.77129601,0,0,0.77129601,324.31484,-384.90486)">
+ d="m 236.04807,496.88936 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="m 236.04807,500.42627 l -56.53253,0"
+ style="fill:none;stroke:#545253;stroke-width:9.10000038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="m 236.04807,504.14551 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -27134,22 +27142,22 @@
transform="matrix(0.77129601,0,0,0.77129601,324.31484,-346.34006)"
id="g6537">
+ d="m 236.04807,496.88936 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:url(#linearGradient15469);fill-opacity:1;fill-rule:evenodd;stroke:#222223;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:url(#linearGradient15465);fill-opacity:1;stroke:#222223;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ d="m 580.00616,-8.938888 l 4.01609,5.3547919 l 19.88923,0 l 6.11976,-5.3547919 l 0.38249,-2.294914 l -30.02508,0.191243 z"
+ style="fill:#df181b;fill-opacity:1;stroke:#000000;stroke-width:0.77129602;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-
+ style="fill:#343535;fill-opacity:1;stroke:#222223;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ cx="374.15601"
+ cy="501.66602"
+ rx="5.4548922"
+ ry="5.2069426" />
+ style="fill:#18181b;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#2f3430;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#949697;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#18181b;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="opacity:0.87969923;fill:#2f3430;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#949697;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -27998,12 +28004,12 @@
@@ -28011,142 +28017,130 @@
sodipodi:nodetypes="ccccc"
style="fill:none;stroke:#000000;stroke-width:6.11999989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0"
- d="M 505.59448,19.583031 L 386.90584,19.234248 L 386.6692,98.186859 L 540.1958,97.139464 L 539.95916,131.04466"
+ d="M 505.59448,19.583031 L 386.90584,19.234248 l -0.23664,78.952611 l 153.5266,-1.047395 l -0.23664,33.905196"
id="path8856-1-5-7-7-6-2-4-1-7-0" />
-
-
+
-
+
-
+
+ transform="translate(-136.3084,-501.68802)"
+ cx="651.43988"
+ cy="483.271"
+ r="5.1442995" />
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.81867599px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#1f4697;fill-opacity:1;stroke:#000000;stroke-width:0.27060601;stroke-miterlimit:4;stroke-opacity:1">
+ d="m -180.40365,849.14123 l 1.52138,-0.14791 c 0.0916,0.51065 0.27645,0.88571 0.55467,1.12518 c 0.28173,0.23948 0.66031,0.35922 1.13575,0.35922 c 0.5036,0 0.88218,-0.10565 1.13575,-0.31696 c 0.25708,-0.21482 0.38562,-0.46486 0.38562,-0.75012 c 0,-0.18312 -0.0546,-0.33808 -0.16375,-0.46486 c -0.10566,-0.1303 -0.29231,-0.243 -0.55996,-0.33809 c -0.18313,-0.0634 -0.60045,-0.17608 -1.25196,-0.33808 c -0.83817,-0.20778 -1.42629,-0.4631 -1.76438,-0.76597 c -0.47543,-0.42612 -0.71314,-0.94557 -0.71314,-1.55836 c 0,-0.39442 0.11093,-0.76244 0.3328,-1.10405 c 0.22539,-0.34512 0.54762,-0.60749 0.96671,-0.7871 c 0.4226,-0.1796 0.93149,-0.2694 1.52666,-0.26941 c 0.97198,10e-6 1.70274,0.21307 2.19226,0.63919 c 0.49303,0.42613 0.75188,0.99489 0.77653,1.70626 l -1.56363,0.0687 c -0.0669,-0.39795 -0.21131,-0.68321 -0.43317,-0.85578 c -0.21835,-0.17608 -0.54763,-0.26412 -0.98784,-0.26412 c -0.4543,0 -0.81,0.0933 -1.06708,0.27997 c -0.16552,0.11974 -0.24828,0.27998 -0.24828,0.48071 c 0,0.18314 0.0775,0.33985 0.23244,0.47015 c 0.19721,0.16553 0.67616,0.33809 1.43685,0.51769 c 0.76068,0.17961 1.3224,0.36626 1.68514,0.55995 c 0.36625,0.19018 0.65151,0.45255 0.85577,0.7871 c 0.20777,0.33105 0.31166,0.74132 0.31167,1.23084 c -1e-5,0.44374 -0.12327,0.8593 -0.36978,1.24668 c -0.24652,0.38739 -0.59517,0.67617 -1.04594,0.86634 c -0.45079,0.18665 -1.0125,0.27998 -1.68514,0.27998 c -0.97904,0 -1.73092,-0.22539 -2.25565,-0.67617 c -0.52474,-0.4543 -0.83817,-1.11462 -0.9403,-1.98096" />
+ d="m -167.82588,848.81371 l 1.51609,0.48072 c -0.23243,0.84521 -0.61982,1.47383 -1.16216,1.88587 c -0.53882,0.40852 -1.22379,0.61277 -2.05491,0.61277 c -1.02834,0 -1.87355,-0.3504 -2.53563,-1.05122 c -0.66208,-0.70434 -0.99312,-1.66577 -0.99312,-2.88428 c 0,-1.28894 0.3328,-2.2891 0.9984,-3.00049 c 0.6656,-0.7149 1.54075,-1.07235 2.62543,-1.07236 c 0.94734,10e-6 1.71683,0.27998 2.30848,0.83993 c 0.35216,0.33104 0.61629,0.80647 0.79238,1.42629 l -1.54778,0.36977 c -0.0916,-0.40146 -0.28351,-0.71842 -0.5758,-0.95086 c -0.28879,-0.23242 -0.64096,-0.34864 -1.05651,-0.34864 c -0.57405,0 -1.04067,0.20602 -1.39988,0.61805 c -0.3557,0.41205 -0.53354,1.07941 -0.53354,2.00209 c 0,0.97904 0.17608,1.67634 0.52826,2.0919 c 0.35216,0.41556 0.80998,0.62334 1.37346,0.62334 c 0.41556,0 0.77301,-0.13206 1.07236,-0.39619 c 0.29934,-0.26413 0.51416,-0.67969 0.64447,-1.24669" />
+ d="m -164.92047,851.66101 l 0,-7.68084 l 1.56363,0 l 0,6.37605 l 3.88797,0 l 0,1.30479 l -5.4516,0" />
+ points="251.619,480.095 251.619,473.728 242.74,473.728 242.74,467.777 251.619,467.777 251.619,467.777 251.619,460.783 233.13,460.783 233.13,492.937 251.619,492.937 251.619,485.734 242.74,485.734 242.74,480.095 " />
+ points="220.283,364.946 253.082,364.946 253.082,454.937 220.283,454.937 220.283,364.946 " />
+ points="225.505,370.688 225.505,449.298 247.754,449.298 247.754,370.688 225.505,370.688 " />
@@ -28217,18 +28211,18 @@
id="revo-ms4525-speed-sensor">
@@ -28270,7 +28264,7 @@
width="11.311534"
y="-466.10336"
x="315.224"
- style="fill:#e9dcdc;display:inline"
+ style="display:inline;fill:#e9dcdc"
inkscape:transform-center-x="-52.764729"
inkscape:transform-center-y="43.141303" />
@@ -28328,7 +28322,7 @@
height="127.94168"
width="102.65967"
id="rect4057-6"
- style="opacity:0.87969923;fill:#0f62a8;fill-opacity:1;stroke:#6c6b6f;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+ style="opacity:0.87969923;fill:#0f62a8;fill-opacity:1;stroke:#6c6b6f;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:url(#linearGradient4376-5-1);fill-opacity:1;stroke:#3d3d3e;stroke-width:0.73051065;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#a6acb0;fill-opacity:1;fill-rule:evenodd;stroke:#6a6c6c;stroke-width:1.56537998;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
MS4525
+ points="242.74,467.777 251.619,467.777 251.619,467.777 251.619,460.783 233.13,460.783 233.13,492.937 251.619,492.937 251.619,485.734 242.74,485.734 242.74,480.095 251.619,480.095 251.619,473.728 242.74,473.728 " />
+ points="220.283,364.946 220.283,364.946 253.082,364.946 253.082,454.937 220.283,454.937 " />
+ points="225.505,370.688 225.505,370.688 225.505,449.298 247.754,449.298 247.754,370.688 " />
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.81867599px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#1f4697;fill-opacity:1;stroke:#000000;stroke-width:0.27060601;stroke-miterlimit:4;stroke-opacity:1">
+ d="m -180.40365,849.14123 l 1.52138,-0.14791 c 0.0916,0.51065 0.27645,0.88571 0.55467,1.12518 c 0.28173,0.23948 0.66031,0.35922 1.13575,0.35922 c 0.5036,0 0.88218,-0.10565 1.13575,-0.31696 c 0.25708,-0.21482 0.38562,-0.46486 0.38562,-0.75012 c 0,-0.18312 -0.0546,-0.33808 -0.16375,-0.46486 c -0.10566,-0.1303 -0.29231,-0.243 -0.55996,-0.33809 c -0.18313,-0.0634 -0.60045,-0.17608 -1.25196,-0.33808 c -0.83817,-0.20778 -1.42629,-0.4631 -1.76438,-0.76597 c -0.47543,-0.42612 -0.71314,-0.94557 -0.71314,-1.55836 c 0,-0.39442 0.11093,-0.76244 0.3328,-1.10405 c 0.22539,-0.34512 0.54762,-0.60749 0.96671,-0.7871 c 0.4226,-0.1796 0.93149,-0.2694 1.52666,-0.26941 c 0.97198,10e-6 1.70274,0.21307 2.19226,0.63919 c 0.49303,0.42613 0.75188,0.99489 0.77653,1.70626 l -1.56363,0.0687 c -0.0669,-0.39795 -0.21131,-0.68321 -0.43317,-0.85578 c -0.21835,-0.17608 -0.54763,-0.26412 -0.98784,-0.26412 c -0.4543,0 -0.81,0.0933 -1.06708,0.27997 c -0.16552,0.11974 -0.24828,0.27998 -0.24828,0.48071 c 0,0.18314 0.0775,0.33985 0.23244,0.47015 c 0.19721,0.16553 0.67616,0.33809 1.43685,0.51769 c 0.76068,0.17961 1.3224,0.36626 1.68514,0.55995 c 0.36625,0.19018 0.65151,0.45255 0.85577,0.7871 c 0.20777,0.33105 0.31166,0.74132 0.31167,1.23084 c -1e-5,0.44374 -0.12327,0.8593 -0.36978,1.24668 c -0.24652,0.38739 -0.59517,0.67617 -1.04594,0.86634 c -0.45079,0.18665 -1.0125,0.27998 -1.68514,0.27998 c -0.97904,0 -1.73092,-0.22539 -2.25565,-0.67617 c -0.52474,-0.4543 -0.83817,-1.11462 -0.9403,-1.98096" />
+ d="m -167.82588,848.81371 l 1.51609,0.48072 c -0.23243,0.84521 -0.61982,1.47383 -1.16216,1.88587 c -0.53882,0.40852 -1.22379,0.61277 -2.05491,0.61277 c -1.02834,0 -1.87355,-0.3504 -2.53563,-1.05122 c -0.66208,-0.70434 -0.99312,-1.66577 -0.99312,-2.88428 c 0,-1.28894 0.3328,-2.2891 0.9984,-3.00049 c 0.6656,-0.7149 1.54075,-1.07235 2.62543,-1.07236 c 0.94734,10e-6 1.71683,0.27998 2.30848,0.83993 c 0.35216,0.33104 0.61629,0.80647 0.79238,1.42629 l -1.54778,0.36977 c -0.0916,-0.40146 -0.28351,-0.71842 -0.5758,-0.95086 c -0.28879,-0.23242 -0.64096,-0.34864 -1.05651,-0.34864 c -0.57405,0 -1.04067,0.20602 -1.39988,0.61805 c -0.3557,0.41205 -0.53354,1.07941 -0.53354,2.00209 c 0,0.97904 0.17608,1.67634 0.52826,2.0919 c 0.35216,0.41556 0.80998,0.62334 1.37346,0.62334 c 0.41556,0 0.77301,-0.13206 1.07236,-0.39619 c 0.29934,-0.26413 0.51416,-0.67969 0.64447,-1.24669" />
+ d="m -164.92047,851.66101 l 0,-7.68084 l 1.56363,0 l 0,6.37605 l 3.88797,0 l 0,1.30479 l -5.4516,0" />
@@ -28751,18 +28745,18 @@
+ d="m 236.04807,500.42627 l -56.53253,0"
+ style="fill:none;stroke:#545253;stroke-width:9.10000038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="m 236.04807,504.14551 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -28771,22 +28765,22 @@
id="g6553-4"
transform="matrix(0.77129601,0,0,0.77129601,-4.0324,109.23554)">
+ d="m 236.04807,496.88936 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="m 236.04807,500.42627 l -56.53253,0"
+ style="fill:none;stroke:#545253;stroke-width:9.10000038;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ d="m 236.04807,504.14551 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -28815,22 +28809,22 @@
transform="matrix(0.77129601,0,0,0.77129601,-4.0324,147.80034)"
id="g6537-9">
+ d="m 236.04807,496.88936 l -56.53253,0"
+ style="fill:none;stroke:#6c6b6f;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ style="fill:url(#linearGradient15115);fill-opacity:1;fill-rule:evenodd;stroke:#222223;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:url(#linearGradient15111);fill-opacity:1;stroke:#222223;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ d="m 251.65892,485.20151 l 4.01609,5.35479 l 19.88923,0 l 6.11976,-5.35479 l 0.38249,-2.29491 l -30.02508,0.19124 z"
+ style="fill:#df181b;fill-opacity:1;stroke:#000000;stroke-width:0.77129602;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-
+ style="fill:#343535;fill-opacity:1;stroke:#222223;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ cx="374.15601"
+ cy="501.66602"
+ rx="5.4548922"
+ ry="5.2069426" />
+ style="fill:#18181b;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#2f3430;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#949697;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#18181b;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="opacity:0.87969923;fill:#2f3430;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ style="fill:#949697;fill-opacity:1;fill-rule:evenodd;stroke:#171600;stroke-width:0.77129602;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -29679,12 +29671,12 @@
@@ -29692,142 +29684,130 @@
sodipodi:nodetypes="ccccc"
style="fill:none;stroke:#000000;stroke-width:6.11999989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0"
- d="M 176.01073,513.67503 L 58.03613,513.32625 L 57.79949,372.27885 L 496.03614,371.23145 L 495.7995,323.13666"
+ d="m 176.01073,513.67503 l -117.9746,-0.34878 l -0.23664,-141.0474 l 438.23665,-1.0474 l -0.23664,-48.09479"
id="path8856-1-5-7-7-6-2-4-1-7-0-8" />
-
-
+
-
+
-
+
+ transform="translate(-465.89215,-7.5960203)"
+ cx="651.43988"
+ cy="483.271"
+ r="5.1442995" />
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.81867599px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Arial Bold';letter-spacing:0px;word-spacing:0px;fill:#1f4697;fill-opacity:1;stroke:#000000;stroke-width:0.27060601;stroke-miterlimit:4;stroke-opacity:1">
+ d="m -180.40365,849.14123 l 1.52138,-0.14791 c 0.0916,0.51065 0.27645,0.88571 0.55467,1.12518 c 0.28173,0.23948 0.66031,0.35922 1.13575,0.35922 c 0.5036,0 0.88218,-0.10565 1.13575,-0.31696 c 0.25708,-0.21482 0.38562,-0.46486 0.38562,-0.75012 c 0,-0.18312 -0.0546,-0.33808 -0.16375,-0.46486 c -0.10566,-0.1303 -0.29231,-0.243 -0.55996,-0.33809 c -0.18313,-0.0634 -0.60045,-0.17608 -1.25196,-0.33808 c -0.83817,-0.20778 -1.42629,-0.4631 -1.76438,-0.76597 c -0.47543,-0.42612 -0.71314,-0.94557 -0.71314,-1.55836 c 0,-0.39442 0.11093,-0.76244 0.3328,-1.10405 c 0.22539,-0.34512 0.54762,-0.60749 0.96671,-0.7871 c 0.4226,-0.1796 0.93149,-0.2694 1.52666,-0.26941 c 0.97198,10e-6 1.70274,0.21307 2.19226,0.63919 c 0.49303,0.42613 0.75188,0.99489 0.77653,1.70626 l -1.56363,0.0687 c -0.0669,-0.39795 -0.21131,-0.68321 -0.43317,-0.85578 c -0.21835,-0.17608 -0.54763,-0.26412 -0.98784,-0.26412 c -0.4543,0 -0.81,0.0933 -1.06708,0.27997 c -0.16552,0.11974 -0.24828,0.27998 -0.24828,0.48071 c 0,0.18314 0.0775,0.33985 0.23244,0.47015 c 0.19721,0.16553 0.67616,0.33809 1.43685,0.51769 c 0.76068,0.17961 1.3224,0.36626 1.68514,0.55995 c 0.36625,0.19018 0.65151,0.45255 0.85577,0.7871 c 0.20777,0.33105 0.31166,0.74132 0.31167,1.23084 c -1e-5,0.44374 -0.12327,0.8593 -0.36978,1.24668 c -0.24652,0.38739 -0.59517,0.67617 -1.04594,0.86634 c -0.45079,0.18665 -1.0125,0.27998 -1.68514,0.27998 c -0.97904,0 -1.73092,-0.22539 -2.25565,-0.67617 c -0.52474,-0.4543 -0.83817,-1.11462 -0.9403,-1.98096" />
+ d="m -167.82588,848.81371 l 1.51609,0.48072 c -0.23243,0.84521 -0.61982,1.47383 -1.16216,1.88587 c -0.53882,0.40852 -1.22379,0.61277 -2.05491,0.61277 c -1.02834,0 -1.87355,-0.3504 -2.53563,-1.05122 c -0.66208,-0.70434 -0.99312,-1.66577 -0.99312,-2.88428 c 0,-1.28894 0.3328,-2.2891 0.9984,-3.00049 c 0.6656,-0.7149 1.54075,-1.07235 2.62543,-1.07236 c 0.94734,10e-6 1.71683,0.27998 2.30848,0.83993 c 0.35216,0.33104 0.61629,0.80647 0.79238,1.42629 l -1.54778,0.36977 c -0.0916,-0.40146 -0.28351,-0.71842 -0.5758,-0.95086 c -0.28879,-0.23242 -0.64096,-0.34864 -1.05651,-0.34864 c -0.57405,0 -1.04067,0.20602 -1.39988,0.61805 c -0.3557,0.41205 -0.53354,1.07941 -0.53354,2.00209 c 0,0.97904 0.17608,1.67634 0.52826,2.0919 c 0.35216,0.41556 0.80998,0.62334 1.37346,0.62334 c 0.41556,0 0.77301,-0.13206 1.07236,-0.39619 c 0.29934,-0.26413 0.51416,-0.67969 0.64447,-1.24669" />
+ d="m -164.92047,851.66101 l 0,-7.68084 l 1.56363,0 l 0,6.37605 l 3.88797,0 l 0,1.30479 l -5.4516,0" />
+ points="251.619,485.734 242.74,485.734 242.74,480.095 251.619,480.095 251.619,473.728 242.74,473.728 242.74,467.777 251.619,467.777 251.619,467.777 251.619,460.783 233.13,460.783 233.13,492.937 251.619,492.937 " />
+ points="253.082,364.946 253.082,454.937 220.283,454.937 220.283,364.946 220.283,364.946 " />
+ points="225.505,449.298 247.754,449.298 247.754,370.688 225.505,370.688 225.505,370.688 " />
@@ -34737,7 +34717,9 @@
+ inkscape:label="cc"
+ style="display:none"
+ sodipodi:insensitive="true">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+