mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
LP-298 Add IBus input to wizard
This commit is contained in:
Laurent Lalanne
parent
5895468f08
commit
848638d6e7
@ -213,6 +213,9 @@ void ConnectionDiagram::setupGraphicsScene()
|
|||||||
case VehicleConfigurationSource::INPUT_EXBUS:
|
case VehicleConfigurationSource::INPUT_EXBUS:
|
||||||
elementsToShow << QString("%1exbus").arg(prefix);
|
elementsToShow << QString("%1exbus").arg(prefix);
|
||||||
break;
|
break;
|
||||||
|
case VehicleConfigurationSource::INPUT_IBUS:
|
||||||
|
elementsToShow << QString("%1ibus").arg(prefix);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -46,6 +46,7 @@ void AirSpeedPage::initializePage(VehicleConfigurationSource *settings)
|
|||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_DSM ||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_DSM ||
|
||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_SRXL ||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_SRXL ||
|
||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_HOTT_SUMD ||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_HOTT_SUMD ||
|
||||||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_IBUS ||
|
||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_EXBUS)) ||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_EXBUS)) ||
|
||||||
settings->getGpsType() == VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG) {
|
settings->getGpsType() == VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG) {
|
||||||
// Disable non estimated sensors if ports are taken by receivers or I2C Mag
|
// Disable non estimated sensors if ports are taken by receivers or I2C Mag
|
||||||
|
|||||||
@ -46,6 +46,7 @@ void GpsPage::initializePage(VehicleConfigurationSource *settings)
|
|||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_DSM ||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_DSM ||
|
||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_SRXL ||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_SRXL ||
|
||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_HOTT_SUMD ||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_HOTT_SUMD ||
|
||||||
|
settings->getInputType() == VehicleConfigurationSource::INPUT_IBUS ||
|
||||||
settings->getInputType() == VehicleConfigurationSource::INPUT_EXBUS)) {
|
settings->getInputType() == VehicleConfigurationSource::INPUT_EXBUS)) {
|
||||||
// Disable GPS+I2C Mag
|
// Disable GPS+I2C Mag
|
||||||
setItemDisabled(VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG, true);
|
setItemDisabled(VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG, true);
|
||||||
|
|||||||
@ -69,6 +69,8 @@ bool InputPage::validatePage()
|
|||||||
getWizard()->setInputType(SetupWizard::INPUT_HOTT_SUMD);
|
getWizard()->setInputType(SetupWizard::INPUT_HOTT_SUMD);
|
||||||
} else if (ui->jetiButton->isChecked()) {
|
} else if (ui->jetiButton->isChecked()) {
|
||||||
getWizard()->setInputType(SetupWizard::INPUT_EXBUS);
|
getWizard()->setInputType(SetupWizard::INPUT_EXBUS);
|
||||||
|
} else if (ui->flyskyButton->isChecked()) {
|
||||||
|
getWizard()->setInputType(SetupWizard::INPUT_IBUS);
|
||||||
} else if (ui->spectrumButton->isChecked()) {
|
} else if (ui->spectrumButton->isChecked()) {
|
||||||
getWizard()->setInputType(SetupWizard::INPUT_DSM);
|
getWizard()->setInputType(SetupWizard::INPUT_DSM);
|
||||||
} else if (ui->multiplexButton->isChecked()) {
|
} else if (ui->multiplexButton->isChecked()) {
|
||||||
@ -112,6 +114,9 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
|
|||||||
case VehicleConfigurationSource::INPUT_EXBUS:
|
case VehicleConfigurationSource::INPUT_EXBUS:
|
||||||
return data.CC_FlexiPort != HwSettings::CC_FLEXIPORT_EXBUS;
|
return data.CC_FlexiPort != HwSettings::CC_FLEXIPORT_EXBUS;
|
||||||
|
|
||||||
|
case VehicleConfigurationSource::INPUT_IBUS:
|
||||||
|
return data.CC_FlexiPort != HwSettings::CC_FLEXIPORT_IBUS;
|
||||||
|
|
||||||
case VehicleConfigurationSource::INPUT_DSM:
|
case VehicleConfigurationSource::INPUT_DSM:
|
||||||
// TODO: Handle all of the DSM types ?? Which is most common?
|
// TODO: Handle all of the DSM types ?? Which is most common?
|
||||||
return data.CC_MainPort != HwSettings::CC_MAINPORT_DSM;
|
return data.CC_MainPort != HwSettings::CC_MAINPORT_DSM;
|
||||||
@ -140,6 +145,9 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
|
|||||||
case VehicleConfigurationSource::INPUT_EXBUS:
|
case VehicleConfigurationSource::INPUT_EXBUS:
|
||||||
return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_EXBUS;
|
return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_EXBUS;
|
||||||
|
|
||||||
|
case VehicleConfigurationSource::INPUT_IBUS:
|
||||||
|
return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_IBUS;
|
||||||
|
|
||||||
case VehicleConfigurationSource::INPUT_SRXL:
|
case VehicleConfigurationSource::INPUT_SRXL:
|
||||||
return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_SRXL;
|
return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_SRXL;
|
||||||
|
|
||||||
@ -173,6 +181,9 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
|
|||||||
case VehicleConfigurationSource::INPUT_EXBUS:
|
case VehicleConfigurationSource::INPUT_EXBUS:
|
||||||
return data.SPK2_RcvrPort != HwSettings::SPK2_RCVRPORT_EXBUS;
|
return data.SPK2_RcvrPort != HwSettings::SPK2_RCVRPORT_EXBUS;
|
||||||
|
|
||||||
|
case VehicleConfigurationSource::INPUT_IBUS:
|
||||||
|
return data.SPK2_RcvrPort != HwSettings::SPK2_RCVRPORT_IBUS;
|
||||||
|
|
||||||
default: return true;
|
default: return true;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@ -139,13 +139,6 @@ p, li { white-space: pre-wrap; }
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>2</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="sbusButton">
|
<widget class="QToolButton" name="sbusButton">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
@ -187,6 +180,13 @@ p, li { white-space: pre-wrap; }
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>2</number>
|
||||||
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="spectrumButton">
|
<widget class="QToolButton" name="spectrumButton">
|
||||||
<property name="font">
|
<property name="font">
|
||||||
@ -351,6 +351,47 @@ p, li { white-space: pre-wrap; }
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="flyskyButton">
|
||||||
|
<property name="font">
|
||||||
|
<font>
|
||||||
|
<pointsize>10</pointsize>
|
||||||
|
</font>
|
||||||
|
</property>
|
||||||
|
<property name="toolTip">
|
||||||
|
<string>FlySky IBus</string>
|
||||||
|
</property>
|
||||||
|
<property name="styleSheet">
|
||||||
|
<string notr="true">QToolButton { border: none }</string>
|
||||||
|
</property>
|
||||||
|
<property name="text">
|
||||||
|
<string>IBus</string>
|
||||||
|
</property>
|
||||||
|
<property name="icon">
|
||||||
|
<iconset resource="../wizardResources.qrc">
|
||||||
|
<normaloff>:/setupwizard/resources/bttn-ibus-up.png</normaloff>
|
||||||
|
<normalon>:/setupwizard/resources/bttn-ibus-down.png</normalon>:/setupwizard/resources/bttn-ibus-up.png</iconset>
|
||||||
|
</property>
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>100</width>
|
||||||
|
<height>100</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="checkable">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="autoExclusive">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
<property name="toolButtonStyle">
|
||||||
|
<enum>Qt::ToolButtonTextUnderIcon</enum>
|
||||||
|
</property>
|
||||||
|
<property name="autoRaise">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|||||||
BIN
ground/gcs/src/plugins/setupwizard/resources/bttn-ibus-down.png
Normal file
BIN
ground/gcs/src/plugins/setupwizard/resources/bttn-ibus-down.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
BIN
ground/gcs/src/plugins/setupwizard/resources/bttn-ibus-up.png
Normal file
BIN
ground/gcs/src/plugins/setupwizard/resources/bttn-ibus-up.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
@ -36,7 +36,7 @@
|
|||||||
inkscape:window-x="0"
|
inkscape:window-x="0"
|
||||||
inkscape:window-y="27"
|
inkscape:window-y="27"
|
||||||
inkscape:window-maximized="1"
|
inkscape:window-maximized="1"
|
||||||
inkscape:current-layer="layer81"
|
inkscape:current-layer="layer79"
|
||||||
fit-margin-top="15"
|
fit-margin-top="15"
|
||||||
fit-margin-left="15"
|
fit-margin-left="15"
|
||||||
fit-margin-right="15"
|
fit-margin-right="15"
|
||||||
@ -19218,6 +19218,46 @@
|
|||||||
y1="431.8125"
|
y1="431.8125"
|
||||||
x2="276"
|
x2="276"
|
||||||
y2="513.56134" />
|
y2="513.56134" />
|
||||||
|
<linearGradient
|
||||||
|
inkscape:collect="always"
|
||||||
|
xlink:href="#linearGradient6587-8-2-7"
|
||||||
|
id="linearGradient16665"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
gradientTransform="translate(-172.71554,-1032.0795)"
|
||||||
|
x1="1250"
|
||||||
|
y1="1450"
|
||||||
|
x2="1490"
|
||||||
|
y2="1450" />
|
||||||
|
<linearGradient
|
||||||
|
inkscape:collect="always"
|
||||||
|
xlink:href="#linearGradient6587-8-2-7"
|
||||||
|
id="linearGradient17268"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
gradientTransform="translate(-151.00134,-881.62884)"
|
||||||
|
x1="1250"
|
||||||
|
y1="1450"
|
||||||
|
x2="1490"
|
||||||
|
y2="1450" />
|
||||||
|
<linearGradient
|
||||||
|
inkscape:collect="always"
|
||||||
|
xlink:href="#linearGradient6587-8-2-7"
|
||||||
|
id="linearGradient17425"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
gradientTransform="translate(-151.00134,-881.62884)"
|
||||||
|
x1="1250"
|
||||||
|
y1="1450"
|
||||||
|
x2="1490"
|
||||||
|
y2="1450" />
|
||||||
|
<linearGradient
|
||||||
|
inkscape:collect="always"
|
||||||
|
xlink:href="#linearGradient6587-8-2-7"
|
||||||
|
id="linearGradient17568"
|
||||||
|
gradientUnits="userSpaceOnUse"
|
||||||
|
gradientTransform="translate(-151.00134,-881.62884)"
|
||||||
|
x1="1250"
|
||||||
|
y1="1450"
|
||||||
|
x2="1490"
|
||||||
|
y2="1450" />
|
||||||
</defs>
|
</defs>
|
||||||
<metadata
|
<metadata
|
||||||
id="metadata12656">
|
id="metadata12656">
|
||||||
@ -20041,6 +20081,115 @@
|
|||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer93"
|
||||||
|
inkscape:label="cc-ibus"
|
||||||
|
style="display:none"
|
||||||
|
sodipodi:insensitive="true">
|
||||||
|
<g
|
||||||
|
style="display:inline"
|
||||||
|
id="cc-ibus"
|
||||||
|
transform="matrix(0,0.4,-0.4,0,931.4684,-115.45414)">
|
||||||
|
<path
|
||||||
|
id="path9857-8-8-1-1-4-0-9-91"
|
||||||
|
d="M 1430.6302,1592 C 1424.6602,1656.9 1487.6898,1787.8293 1662.8577,1689.9523"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="ccc"
|
||||||
|
style="fill:none;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1392.571,1323.8556 L 1392.571,1037.0524 L 1109.0353,1037.0524"
|
||||||
|
id="path8856-5-1-7-1-9-5-4-3-7-0-7-7" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="ccc"
|
||||||
|
style="fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1362.571,1323.8556 L 1362.5703,1071.9612 L 1109.0353,1072.1435"
|
||||||
|
id="path8856-1-2-1-9-0-9-7-4-7" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="ccc"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1347.571,1323.8556 L 1347.571,1087.0524 L 1109.0353,1087.0524"
|
||||||
|
id="path8856-1-5-7-7-2-9-3-2-3-1" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
d="M 1308.744,1592 C 1314.714,1656.9 1251.6844,1787.8293 1076.5165,1689.9523"
|
||||||
|
id="path21749-5-7-5-15" />
|
||||||
|
<rect
|
||||||
|
rx="11.5"
|
||||||
|
id="rect8853-6-8-6-6-4-6-7-97"
|
||||||
|
style="color:#000000;fill:url(#linearGradient17568);fill-rule:nonzero;stroke:#000000;stroke-width:5.76999998;stroke-miterlimit:4;stroke-dasharray:none;enable-background:accumulate"
|
||||||
|
ry="11.5"
|
||||||
|
height="272"
|
||||||
|
width="237"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
y="1320"
|
||||||
|
x="1250" />
|
||||||
|
<g
|
||||||
|
transform="matrix(0,1,-1,0,2674.3512,108.4981)"
|
||||||
|
style="display:inline"
|
||||||
|
id="g17270-0">
|
||||||
|
<g
|
||||||
|
id="text17069-3-8"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.27642822px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
transform="scale(-1,-1)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17087-6-8"
|
||||||
|
d="M -1412.1475,-1323.0706 L -1412.1475,-1352.6171 L -1391.8922,-1352.6171 L -1391.8922,-1347.6187 L -1406.1817,-1347.6187 L -1406.1817,-1340.6251 L -1393.8472,-1340.6251 L -1393.8472,-1335.6268 L -1406.1817,-1335.6268 L -1406.1817,-1323.0706 L -1412.1475,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17089-1-5"
|
||||||
|
d="M -1386.9946,-1323.0706 L -1386.9946,-1352.6171 L -1381.3312,-1352.6171 L -1381.3312,-1323.0706 L -1386.9946,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17091-2-0"
|
||||||
|
d="M -1378.2274,-1344.4746 L -1372.2012,-1344.4746 L -1367.082,-1329.2781 L -1362.0837,-1344.4746 L -1356.2187,-1344.4746 L -1363.7767,-1323.8767 L -1365.127,-1320.1482 Q -1365.8727,-1318.2738 -1366.558,-1317.2862 Q -1367.2231,-1316.2986 -1368.1099,-1315.694 Q -1368.9765,-1315.0692 -1370.2664,-1314.7266 Q -1371.5361,-1314.384 -1373.1485,-1314.384 Q -1374.781,-1314.384 -1376.3531,-1314.7266 L -1376.8569,-1319.1606 Q -1375.5267,-1318.8986 -1374.4585,-1318.8986 Q -1372.4834,-1318.8986 -1371.5361,-1320.0675 Q -1370.5889,-1321.2163 -1370.085,-1323.0101 L -1378.2274,-1344.4746 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17093-9-9"
|
||||||
|
d="M -1354.2033,-1332.6843 L -1348.3988,-1333.2486 Q -1347.8747,-1330.3262 -1346.2825,-1328.9557 Q -1344.6702,-1327.5852 -1341.9493,-1327.5852 Q -1339.0672,-1327.5852 -1337.6161,-1328.7944 Q -1336.1448,-1330.0239 -1336.1448,-1331.6564 Q -1336.1448,-1332.7044 -1336.7696,-1333.43 Q -1337.3742,-1334.1757 -1338.906,-1334.7199 Q -1339.954,-1335.0826 -1343.6826,-1336.0097 Q -1348.4794,-1337.1989 -1350.4142,-1338.9322 Q -1353.1351,-1341.3708 -1353.1351,-1344.8777 Q -1353.1351,-1347.135 -1351.8653,-1349.09 Q -1350.5755,-1351.0652 -1348.1771,-1352.093 Q -1345.7585,-1353.1209 -1342.3524,-1353.1209 Q -1336.7898,-1353.1209 -1333.9883,-1350.6822 Q -1331.1667,-1348.2435 -1331.0256,-1344.1723 L -1336.9913,-1343.9103 Q -1337.3742,-1346.1878 -1338.644,-1347.1753 Q -1339.8936,-1348.1831 -1342.4129,-1348.1831 Q -1345.0128,-1348.1831 -1346.4841,-1347.1149 Q -1347.4313,-1346.4296 -1347.4313,-1345.2808 Q -1347.4313,-1344.2328 -1346.5445,-1343.4871 Q -1345.4159,-1342.5398 -1341.0625,-1341.5119 Q -1336.7091,-1340.484 -1334.6332,-1339.3756 Q -1332.5372,-1338.2872 -1331.3682,-1336.3725 Q -1330.1791,-1334.478 -1330.1791,-1331.6765 Q -1330.1791,-1329.1371 -1331.5899,-1326.9201 Q -1333.0007,-1324.7031 -1335.5805,-1323.6147 Q -1338.1603,-1322.5465 -1342.0098,-1322.5465 Q -1347.6127,-1322.5465 -1350.6158,-1325.1263 Q -1353.6188,-1327.7262 -1354.2033,-1332.6843 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17095-3-63"
|
||||||
|
d="M -1325.3622,-1323.0706 L -1325.3622,-1352.6171 L -1319.6987,-1352.6171 L -1319.6987,-1336.9369 L -1313.0679,-1344.4746 L -1306.0945,-1344.4746 L -1313.4105,-1336.6547 L -1305.5704,-1323.0706 L -1311.6773,-1323.0706 L -1317.0585,-1332.6843 L -1319.6987,-1329.9231 L -1319.6987,-1323.0706 L -1325.3622,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17097-1-8"
|
||||||
|
d="M -1304.865,-1344.4746 L -1298.8388,-1344.4746 L -1293.7196,-1329.2781 L -1288.7213,-1344.4746 L -1282.8563,-1344.4746 L -1290.4143,-1323.8767 L -1291.7646,-1320.1482 Q -1292.5103,-1318.2738 -1293.1956,-1317.2862 Q -1293.8607,-1316.2986 -1294.7475,-1315.694 Q -1295.6141,-1315.0692 -1296.904,-1314.7266 Q -1298.1737,-1314.384 -1299.7861,-1314.384 Q -1301.4186,-1314.384 -1302.9907,-1314.7266 L -1303.4945,-1319.1606 Q -1302.1643,-1318.8986 -1301.0961,-1318.8986 Q -1299.121,-1318.8986 -1298.1737,-1320.0675 Q -1297.2265,-1321.2163 -1296.7226,-1323.0101 L -1304.865,-1344.4746 Z" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="text17073-9-5"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:56.25px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
transform="scale(-1,-1)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17078-4-61"
|
||||||
|
d="M -1402.5568,-1259.2407 L -1402.5568,-1299.5056 L -1394.4269,-1299.5056 L -1394.4269,-1259.2407 L -1402.5568,-1259.2407 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17080-7-15"
|
||||||
|
d="M -1386.6815,-1299.5056 L -1370.5865,-1299.5056 Q -1365.8075,-1299.5056 -1363.4729,-1299.0936 Q -1361.1108,-1298.7091 -1359.2706,-1297.4457 Q -1357.403,-1296.1823 -1356.167,-1294.0674 Q -1354.931,-1291.98 -1354.931,-1289.3707 Q -1354.931,-1286.5417 -1356.4691,-1284.1797 Q -1357.9797,-1281.8176 -1360.589,-1280.6366 Q -1356.9086,-1279.5654 -1354.931,-1276.9836 Q -1352.9535,-1274.4019 -1352.9535,-1270.9137 Q -1352.9535,-1268.1671 -1354.2444,-1265.5579 Q -1355.5078,-1262.9761 -1357.7325,-1261.4105 Q -1359.9298,-1259.8724 -1363.1708,-1259.5154 Q -1365.2032,-1259.2957 -1372.9761,-1259.2407 L -1386.6815,-1259.2407 L -1386.6815,-1299.5056 Z M -1378.5516,-1292.804 L -1378.5516,-1283.493 L -1373.2233,-1283.493 Q -1368.4717,-1283.493 -1367.3181,-1283.6304 Q -1365.2307,-1283.8776 -1364.0497,-1285.0586 Q -1362.8412,-1286.2671 -1362.8412,-1288.2172 Q -1362.8412,-1290.0848 -1363.8849,-1291.2384 Q -1364.9011,-1292.4194 -1366.9336,-1292.6666 Q -1368.1421,-1292.804 -1373.8824,-1292.804 L -1378.5516,-1292.804 Z M -1378.5516,-1276.7914 L -1378.5516,-1266.0248 L -1371.026,-1266.0248 Q -1366.6315,-1266.0248 -1365.4504,-1266.272 Q -1363.6377,-1266.6016 -1362.5116,-1267.865 Q -1361.358,-1269.1559 -1361.358,-1271.2982 Q -1361.358,-1273.111 -1362.2369,-1274.3744 Q -1363.1158,-1275.6378 -1364.7913,-1276.2146 Q -1366.4392,-1276.7914 -1371.9873,-1276.7914 L -1378.5516,-1276.7914 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17082-8-9"
|
||||||
|
d="M -1326.9159,-1259.2407 L -1326.9159,-1263.6078 Q -1328.5089,-1261.2732 -1331.1182,-1259.9274 Q -1333.7,-1258.5815 -1336.5839,-1258.5815 Q -1339.5227,-1258.5815 -1341.8573,-1259.8724 Q -1344.1919,-1261.1633 -1345.2356,-1263.4979 Q -1346.2793,-1265.8325 -1346.2793,-1269.9524 L -1346.2793,-1288.4094 L -1338.5614,-1288.4094 L -1338.5614,-1275.0061 Q -1338.5614,-1268.8538 -1338.1494,-1267.453 Q -1337.71,-1266.0797 -1336.5839,-1265.2557 Q -1335.4578,-1264.4592 -1333.7274,-1264.4592 Q -1331.7499,-1264.4592 -1330.1843,-1265.5304 Q -1328.6188,-1266.629 -1328.042,-1268.222 Q -1327.4652,-1269.8425 -1327.4652,-1276.1047 L -1327.4652,-1288.4094 L -1319.7473,-1288.4094 L -1319.7473,-1259.2407 L -1326.9159,-1259.2407 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17084-4-8"
|
||||||
|
d="M -1314.4464,-1267.5629 L -1306.701,-1268.7439 Q -1306.2067,-1266.4917 -1304.696,-1265.3107 Q -1303.1854,-1264.1571 -1300.4663,-1264.1571 Q -1297.4725,-1264.1571 -1295.9619,-1265.2557 Q -1294.9457,-1266.0248 -1294.9457,-1267.3157 Q -1294.9457,-1268.1946 -1295.495,-1268.7714 Q -1296.0718,-1269.3207 -1298.0768,-1269.7876 Q -1307.4152,-1271.8475 -1309.9146,-1273.5504 Q -1313.3752,-1275.9125 -1313.3752,-1280.1147 Q -1313.3752,-1283.905 -1310.3815,-1286.4868 Q -1307.3877,-1289.0686 -1301.098,-1289.0686 Q -1295.1105,-1289.0686 -1292.1991,-1287.1185 Q -1289.2877,-1285.1685 -1288.1891,-1281.3507 L -1295.4675,-1280.0049 Q -1295.9344,-1281.7078 -1297.2528,-1282.6141 Q -1298.5437,-1283.5205 -1300.9607,-1283.5205 Q -1304.0094,-1283.5205 -1305.3278,-1282.6691 Q -1306.2067,-1282.0648 -1306.2067,-1281.1035 Q -1306.2067,-1280.2795 -1305.4376,-1279.7028 Q -1304.3939,-1278.9337 -1298.2416,-1277.533 Q -1292.0618,-1276.1322 -1289.6173,-1274.0997 Q -1287.2003,-1272.0398 -1287.2003,-1268.3594 Q -1287.2003,-1264.3494 -1290.5511,-1261.4655 Q -1293.902,-1258.5815 -1300.4663,-1258.5815 Q -1306.4264,-1258.5815 -1309.9146,-1260.9985 Q -1313.3752,-1263.4155 -1314.4464,-1267.5629 Z" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
<g
|
<g
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer61"
|
id="layer61"
|
||||||
@ -21044,6 +21193,115 @@
|
|||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer92"
|
||||||
|
inkscape:label="revo-ibus"
|
||||||
|
sodipodi:insensitive="true"
|
||||||
|
style="display:none">
|
||||||
|
<g
|
||||||
|
style="display:inline"
|
||||||
|
id="revo-ibus"
|
||||||
|
transform="matrix(0,0.4,-0.4,0,929.4684,-117.45414)">
|
||||||
|
<path
|
||||||
|
id="path9857-8-8-1-1-4-0-9-3-6"
|
||||||
|
d="M 1430.6302,1592 C 1424.6602,1656.9 1487.6898,1787.8293 1662.8577,1689.9523"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="ccc"
|
||||||
|
style="fill:none;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1392.571,1323.8556 L 1392.571,1037.0524 L 1104.0353,1037.0524"
|
||||||
|
id="path8856-5-1-7-1-9-5-4-3-7-0-7-0-8" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="ccc"
|
||||||
|
style="fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1362.571,1323.8556 L 1362.5703,1071.9612 L 1104.0353,1072.1435"
|
||||||
|
id="path8856-1-2-1-9-0-9-7-4-5-8" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="ccc"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1347.571,1323.8556 L 1347.571,1087.0524 L 1104.0353,1087.0524"
|
||||||
|
id="path8856-1-5-7-7-2-9-3-2-3-5-4" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
d="M 1308.744,1592 C 1314.714,1656.9 1251.6844,1787.8293 1076.5165,1689.9523"
|
||||||
|
id="path21749-5-7-5-1-3" />
|
||||||
|
<rect
|
||||||
|
rx="11.5"
|
||||||
|
id="rect8853-6-8-6-6-4-6-7-9-14"
|
||||||
|
style="color:#000000;fill:url(#linearGradient17425);fill-rule:nonzero;stroke:#000000;stroke-width:5.76999998;stroke-miterlimit:4;stroke-dasharray:none;enable-background:accumulate"
|
||||||
|
ry="11.5"
|
||||||
|
height="272"
|
||||||
|
width="237"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
y="1320"
|
||||||
|
x="1250" />
|
||||||
|
<g
|
||||||
|
transform="matrix(0,1,-1,0,2674.3512,108.4981)"
|
||||||
|
style="display:inline"
|
||||||
|
id="g17270-1">
|
||||||
|
<g
|
||||||
|
id="text17069-3-7"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.27642822px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
transform="scale(-1,-1)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17087-6-2"
|
||||||
|
d="M -1412.1475,-1323.0706 L -1412.1475,-1352.6171 L -1391.8922,-1352.6171 L -1391.8922,-1347.6187 L -1406.1817,-1347.6187 L -1406.1817,-1340.6251 L -1393.8472,-1340.6251 L -1393.8472,-1335.6268 L -1406.1817,-1335.6268 L -1406.1817,-1323.0706 L -1412.1475,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17089-1-7"
|
||||||
|
d="M -1386.9946,-1323.0706 L -1386.9946,-1352.6171 L -1381.3312,-1352.6171 L -1381.3312,-1323.0706 L -1386.9946,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17091-2-2"
|
||||||
|
d="M -1378.2274,-1344.4746 L -1372.2012,-1344.4746 L -1367.082,-1329.2781 L -1362.0837,-1344.4746 L -1356.2187,-1344.4746 L -1363.7767,-1323.8767 L -1365.127,-1320.1482 Q -1365.8727,-1318.2738 -1366.558,-1317.2862 Q -1367.2231,-1316.2986 -1368.1099,-1315.694 Q -1368.9765,-1315.0692 -1370.2664,-1314.7266 Q -1371.5361,-1314.384 -1373.1485,-1314.384 Q -1374.781,-1314.384 -1376.3531,-1314.7266 L -1376.8569,-1319.1606 Q -1375.5267,-1318.8986 -1374.4585,-1318.8986 Q -1372.4834,-1318.8986 -1371.5361,-1320.0675 Q -1370.5889,-1321.2163 -1370.085,-1323.0101 L -1378.2274,-1344.4746 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17093-9-2"
|
||||||
|
d="M -1354.2033,-1332.6843 L -1348.3988,-1333.2486 Q -1347.8747,-1330.3262 -1346.2825,-1328.9557 Q -1344.6702,-1327.5852 -1341.9493,-1327.5852 Q -1339.0672,-1327.5852 -1337.6161,-1328.7944 Q -1336.1448,-1330.0239 -1336.1448,-1331.6564 Q -1336.1448,-1332.7044 -1336.7696,-1333.43 Q -1337.3742,-1334.1757 -1338.906,-1334.7199 Q -1339.954,-1335.0826 -1343.6826,-1336.0097 Q -1348.4794,-1337.1989 -1350.4142,-1338.9322 Q -1353.1351,-1341.3708 -1353.1351,-1344.8777 Q -1353.1351,-1347.135 -1351.8653,-1349.09 Q -1350.5755,-1351.0652 -1348.1771,-1352.093 Q -1345.7585,-1353.1209 -1342.3524,-1353.1209 Q -1336.7898,-1353.1209 -1333.9883,-1350.6822 Q -1331.1667,-1348.2435 -1331.0256,-1344.1723 L -1336.9913,-1343.9103 Q -1337.3742,-1346.1878 -1338.644,-1347.1753 Q -1339.8936,-1348.1831 -1342.4129,-1348.1831 Q -1345.0128,-1348.1831 -1346.4841,-1347.1149 Q -1347.4313,-1346.4296 -1347.4313,-1345.2808 Q -1347.4313,-1344.2328 -1346.5445,-1343.4871 Q -1345.4159,-1342.5398 -1341.0625,-1341.5119 Q -1336.7091,-1340.484 -1334.6332,-1339.3756 Q -1332.5372,-1338.2872 -1331.3682,-1336.3725 Q -1330.1791,-1334.478 -1330.1791,-1331.6765 Q -1330.1791,-1329.1371 -1331.5899,-1326.9201 Q -1333.0007,-1324.7031 -1335.5805,-1323.6147 Q -1338.1603,-1322.5465 -1342.0098,-1322.5465 Q -1347.6127,-1322.5465 -1350.6158,-1325.1263 Q -1353.6188,-1327.7262 -1354.2033,-1332.6843 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17095-3-6"
|
||||||
|
d="M -1325.3622,-1323.0706 L -1325.3622,-1352.6171 L -1319.6987,-1352.6171 L -1319.6987,-1336.9369 L -1313.0679,-1344.4746 L -1306.0945,-1344.4746 L -1313.4105,-1336.6547 L -1305.5704,-1323.0706 L -1311.6773,-1323.0706 L -1317.0585,-1332.6843 L -1319.6987,-1329.9231 L -1319.6987,-1323.0706 L -1325.3622,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17097-1-1"
|
||||||
|
d="M -1304.865,-1344.4746 L -1298.8388,-1344.4746 L -1293.7196,-1329.2781 L -1288.7213,-1344.4746 L -1282.8563,-1344.4746 L -1290.4143,-1323.8767 L -1291.7646,-1320.1482 Q -1292.5103,-1318.2738 -1293.1956,-1317.2862 Q -1293.8607,-1316.2986 -1294.7475,-1315.694 Q -1295.6141,-1315.0692 -1296.904,-1314.7266 Q -1298.1737,-1314.384 -1299.7861,-1314.384 Q -1301.4186,-1314.384 -1302.9907,-1314.7266 L -1303.4945,-1319.1606 Q -1302.1643,-1318.8986 -1301.0961,-1318.8986 Q -1299.121,-1318.8986 -1298.1737,-1320.0675 Q -1297.2265,-1321.2163 -1296.7226,-1323.0101 L -1304.865,-1344.4746 Z" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="text17073-9-0"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:56.25px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
transform="scale(-1,-1)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17078-4-6"
|
||||||
|
d="M -1402.5568,-1259.2407 L -1402.5568,-1299.5056 L -1394.4269,-1299.5056 L -1394.4269,-1259.2407 L -1402.5568,-1259.2407 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17080-7-1"
|
||||||
|
d="M -1386.6815,-1299.5056 L -1370.5865,-1299.5056 Q -1365.8075,-1299.5056 -1363.4729,-1299.0936 Q -1361.1108,-1298.7091 -1359.2706,-1297.4457 Q -1357.403,-1296.1823 -1356.167,-1294.0674 Q -1354.931,-1291.98 -1354.931,-1289.3707 Q -1354.931,-1286.5417 -1356.4691,-1284.1797 Q -1357.9797,-1281.8176 -1360.589,-1280.6366 Q -1356.9086,-1279.5654 -1354.931,-1276.9836 Q -1352.9535,-1274.4019 -1352.9535,-1270.9137 Q -1352.9535,-1268.1671 -1354.2444,-1265.5579 Q -1355.5078,-1262.9761 -1357.7325,-1261.4105 Q -1359.9298,-1259.8724 -1363.1708,-1259.5154 Q -1365.2032,-1259.2957 -1372.9761,-1259.2407 L -1386.6815,-1259.2407 L -1386.6815,-1299.5056 Z M -1378.5516,-1292.804 L -1378.5516,-1283.493 L -1373.2233,-1283.493 Q -1368.4717,-1283.493 -1367.3181,-1283.6304 Q -1365.2307,-1283.8776 -1364.0497,-1285.0586 Q -1362.8412,-1286.2671 -1362.8412,-1288.2172 Q -1362.8412,-1290.0848 -1363.8849,-1291.2384 Q -1364.9011,-1292.4194 -1366.9336,-1292.6666 Q -1368.1421,-1292.804 -1373.8824,-1292.804 L -1378.5516,-1292.804 Z M -1378.5516,-1276.7914 L -1378.5516,-1266.0248 L -1371.026,-1266.0248 Q -1366.6315,-1266.0248 -1365.4504,-1266.272 Q -1363.6377,-1266.6016 -1362.5116,-1267.865 Q -1361.358,-1269.1559 -1361.358,-1271.2982 Q -1361.358,-1273.111 -1362.2369,-1274.3744 Q -1363.1158,-1275.6378 -1364.7913,-1276.2146 Q -1366.4392,-1276.7914 -1371.9873,-1276.7914 L -1378.5516,-1276.7914 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17082-8-5"
|
||||||
|
d="M -1326.9159,-1259.2407 L -1326.9159,-1263.6078 Q -1328.5089,-1261.2732 -1331.1182,-1259.9274 Q -1333.7,-1258.5815 -1336.5839,-1258.5815 Q -1339.5227,-1258.5815 -1341.8573,-1259.8724 Q -1344.1919,-1261.1633 -1345.2356,-1263.4979 Q -1346.2793,-1265.8325 -1346.2793,-1269.9524 L -1346.2793,-1288.4094 L -1338.5614,-1288.4094 L -1338.5614,-1275.0061 Q -1338.5614,-1268.8538 -1338.1494,-1267.453 Q -1337.71,-1266.0797 -1336.5839,-1265.2557 Q -1335.4578,-1264.4592 -1333.7274,-1264.4592 Q -1331.7499,-1264.4592 -1330.1843,-1265.5304 Q -1328.6188,-1266.629 -1328.042,-1268.222 Q -1327.4652,-1269.8425 -1327.4652,-1276.1047 L -1327.4652,-1288.4094 L -1319.7473,-1288.4094 L -1319.7473,-1259.2407 L -1326.9159,-1259.2407 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17084-4-9"
|
||||||
|
d="M -1314.4464,-1267.5629 L -1306.701,-1268.7439 Q -1306.2067,-1266.4917 -1304.696,-1265.3107 Q -1303.1854,-1264.1571 -1300.4663,-1264.1571 Q -1297.4725,-1264.1571 -1295.9619,-1265.2557 Q -1294.9457,-1266.0248 -1294.9457,-1267.3157 Q -1294.9457,-1268.1946 -1295.495,-1268.7714 Q -1296.0718,-1269.3207 -1298.0768,-1269.7876 Q -1307.4152,-1271.8475 -1309.9146,-1273.5504 Q -1313.3752,-1275.9125 -1313.3752,-1280.1147 Q -1313.3752,-1283.905 -1310.3815,-1286.4868 Q -1307.3877,-1289.0686 -1301.098,-1289.0686 Q -1295.1105,-1289.0686 -1292.1991,-1287.1185 Q -1289.2877,-1285.1685 -1288.1891,-1281.3507 L -1295.4675,-1280.0049 Q -1295.9344,-1281.7078 -1297.2528,-1282.6141 Q -1298.5437,-1283.5205 -1300.9607,-1283.5205 Q -1304.0094,-1283.5205 -1305.3278,-1282.6691 Q -1306.2067,-1282.0648 -1306.2067,-1281.1035 Q -1306.2067,-1280.2795 -1305.4376,-1279.7028 Q -1304.3939,-1278.9337 -1298.2416,-1277.533 Q -1292.0618,-1276.1322 -1289.6173,-1274.0997 Q -1287.2003,-1272.0398 -1287.2003,-1268.3594 Q -1287.2003,-1264.3494 -1290.5511,-1261.4655 Q -1293.902,-1258.5815 -1300.4663,-1258.5815 Q -1306.4264,-1258.5815 -1309.9146,-1260.9985 Q -1313.3752,-1263.4155 -1314.4464,-1267.5629 Z" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
<g
|
<g
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer21"
|
id="layer21"
|
||||||
@ -21828,6 +22086,115 @@
|
|||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer91"
|
||||||
|
inkscape:label="nano-ibus"
|
||||||
|
style="display:none"
|
||||||
|
sodipodi:insensitive="true">
|
||||||
|
<g
|
||||||
|
style="display:inline"
|
||||||
|
id="nano-ibus"
|
||||||
|
transform="matrix(-0.4,0,0,-0.4,1078.3424,590.20822)">
|
||||||
|
<path
|
||||||
|
id="path9857-8-8-1-1-4-0-9-3-2-61"
|
||||||
|
d="M 1430.6302,1592 C 1424.6602,1656.9 1487.6898,1787.8293 1662.8577,1689.9523"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="fill:none;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1392.571,1323.8556 L 1392.571,1152.8337"
|
||||||
|
id="path8856-5-1-7-1-9-5-4-3-7-0-7-0-6-0" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1362.571,1323.8556 L 1362.571,1152.8347"
|
||||||
|
id="path8856-1-2-1-9-0-9-7-4-5-2-6" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="fill:none;stroke:#000000;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1347.571,1323.8556 L 1347.571,1152.8347"
|
||||||
|
id="path8856-1-5-7-7-2-9-3-2-3-5-1-3" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
d="M 1308.744,1592 C 1314.714,1656.9 1251.6844,1787.8293 1076.5165,1689.9523"
|
||||||
|
id="path21749-5-7-5-1-7-2" />
|
||||||
|
<rect
|
||||||
|
rx="11.5"
|
||||||
|
id="rect8853-6-8-6-6-4-6-7-9-8-0"
|
||||||
|
style="color:#000000;fill:url(#linearGradient17268);fill-rule:nonzero;stroke:#000000;stroke-width:5.76999998;stroke-miterlimit:4;stroke-dasharray:none;enable-background:accumulate"
|
||||||
|
ry="11.5"
|
||||||
|
height="272"
|
||||||
|
width="237"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
y="1320"
|
||||||
|
x="1250" />
|
||||||
|
<g
|
||||||
|
transform="translate(20.9981,150.1488)"
|
||||||
|
style="display:inline"
|
||||||
|
id="g17270">
|
||||||
|
<g
|
||||||
|
id="text17069-3"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.27642822px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
transform="scale(-1,-1)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17087-6"
|
||||||
|
d="M -1412.1475,-1323.0706 L -1412.1475,-1352.6171 L -1391.8922,-1352.6171 L -1391.8922,-1347.6187 L -1406.1817,-1347.6187 L -1406.1817,-1340.6251 L -1393.8472,-1340.6251 L -1393.8472,-1335.6268 L -1406.1817,-1335.6268 L -1406.1817,-1323.0706 L -1412.1475,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17089-1"
|
||||||
|
d="M -1386.9946,-1323.0706 L -1386.9946,-1352.6171 L -1381.3312,-1352.6171 L -1381.3312,-1323.0706 L -1386.9946,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17091-2"
|
||||||
|
d="M -1378.2274,-1344.4746 L -1372.2012,-1344.4746 L -1367.082,-1329.2781 L -1362.0837,-1344.4746 L -1356.2187,-1344.4746 L -1363.7767,-1323.8767 L -1365.127,-1320.1482 Q -1365.8727,-1318.2738 -1366.558,-1317.2862 Q -1367.2231,-1316.2986 -1368.1099,-1315.694 Q -1368.9765,-1315.0692 -1370.2664,-1314.7266 Q -1371.5361,-1314.384 -1373.1485,-1314.384 Q -1374.781,-1314.384 -1376.3531,-1314.7266 L -1376.8569,-1319.1606 Q -1375.5267,-1318.8986 -1374.4585,-1318.8986 Q -1372.4834,-1318.8986 -1371.5361,-1320.0675 Q -1370.5889,-1321.2163 -1370.085,-1323.0101 L -1378.2274,-1344.4746 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17093-9"
|
||||||
|
d="M -1354.2033,-1332.6843 L -1348.3988,-1333.2486 Q -1347.8747,-1330.3262 -1346.2825,-1328.9557 Q -1344.6702,-1327.5852 -1341.9493,-1327.5852 Q -1339.0672,-1327.5852 -1337.6161,-1328.7944 Q -1336.1448,-1330.0239 -1336.1448,-1331.6564 Q -1336.1448,-1332.7044 -1336.7696,-1333.43 Q -1337.3742,-1334.1757 -1338.906,-1334.7199 Q -1339.954,-1335.0826 -1343.6826,-1336.0097 Q -1348.4794,-1337.1989 -1350.4142,-1338.9322 Q -1353.1351,-1341.3708 -1353.1351,-1344.8777 Q -1353.1351,-1347.135 -1351.8653,-1349.09 Q -1350.5755,-1351.0652 -1348.1771,-1352.093 Q -1345.7585,-1353.1209 -1342.3524,-1353.1209 Q -1336.7898,-1353.1209 -1333.9883,-1350.6822 Q -1331.1667,-1348.2435 -1331.0256,-1344.1723 L -1336.9913,-1343.9103 Q -1337.3742,-1346.1878 -1338.644,-1347.1753 Q -1339.8936,-1348.1831 -1342.4129,-1348.1831 Q -1345.0128,-1348.1831 -1346.4841,-1347.1149 Q -1347.4313,-1346.4296 -1347.4313,-1345.2808 Q -1347.4313,-1344.2328 -1346.5445,-1343.4871 Q -1345.4159,-1342.5398 -1341.0625,-1341.5119 Q -1336.7091,-1340.484 -1334.6332,-1339.3756 Q -1332.5372,-1338.2872 -1331.3682,-1336.3725 Q -1330.1791,-1334.478 -1330.1791,-1331.6765 Q -1330.1791,-1329.1371 -1331.5899,-1326.9201 Q -1333.0007,-1324.7031 -1335.5805,-1323.6147 Q -1338.1603,-1322.5465 -1342.0098,-1322.5465 Q -1347.6127,-1322.5465 -1350.6158,-1325.1263 Q -1353.6188,-1327.7262 -1354.2033,-1332.6843 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17095-3"
|
||||||
|
d="M -1325.3622,-1323.0706 L -1325.3622,-1352.6171 L -1319.6987,-1352.6171 L -1319.6987,-1336.9369 L -1313.0679,-1344.4746 L -1306.0945,-1344.4746 L -1313.4105,-1336.6547 L -1305.5704,-1323.0706 L -1311.6773,-1323.0706 L -1317.0585,-1332.6843 L -1319.6987,-1329.9231 L -1319.6987,-1323.0706 L -1325.3622,-1323.0706 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17097-1"
|
||||||
|
d="M -1304.865,-1344.4746 L -1298.8388,-1344.4746 L -1293.7196,-1329.2781 L -1288.7213,-1344.4746 L -1282.8563,-1344.4746 L -1290.4143,-1323.8767 L -1291.7646,-1320.1482 Q -1292.5103,-1318.2738 -1293.1956,-1317.2862 Q -1293.8607,-1316.2986 -1294.7475,-1315.694 Q -1295.6141,-1315.0692 -1296.904,-1314.7266 Q -1298.1737,-1314.384 -1299.7861,-1314.384 Q -1301.4186,-1314.384 -1302.9907,-1314.7266 L -1303.4945,-1319.1606 Q -1302.1643,-1318.8986 -1301.0961,-1318.8986 Q -1299.121,-1318.8986 -1298.1737,-1320.0675 Q -1297.2265,-1321.2163 -1296.7226,-1323.0101 L -1304.865,-1344.4746 Z" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
id="text17073-9"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:56.25px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
transform="scale(-1,-1)">
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17078-4"
|
||||||
|
d="M -1402.5568,-1259.2407 L -1402.5568,-1299.5056 L -1394.4269,-1299.5056 L -1394.4269,-1259.2407 L -1402.5568,-1259.2407 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17080-7"
|
||||||
|
d="M -1386.6815,-1299.5056 L -1370.5865,-1299.5056 Q -1365.8075,-1299.5056 -1363.4729,-1299.0936 Q -1361.1108,-1298.7091 -1359.2706,-1297.4457 Q -1357.403,-1296.1823 -1356.167,-1294.0674 Q -1354.931,-1291.98 -1354.931,-1289.3707 Q -1354.931,-1286.5417 -1356.4691,-1284.1797 Q -1357.9797,-1281.8176 -1360.589,-1280.6366 Q -1356.9086,-1279.5654 -1354.931,-1276.9836 Q -1352.9535,-1274.4019 -1352.9535,-1270.9137 Q -1352.9535,-1268.1671 -1354.2444,-1265.5579 Q -1355.5078,-1262.9761 -1357.7325,-1261.4105 Q -1359.9298,-1259.8724 -1363.1708,-1259.5154 Q -1365.2032,-1259.2957 -1372.9761,-1259.2407 L -1386.6815,-1259.2407 L -1386.6815,-1299.5056 Z M -1378.5516,-1292.804 L -1378.5516,-1283.493 L -1373.2233,-1283.493 Q -1368.4717,-1283.493 -1367.3181,-1283.6304 Q -1365.2307,-1283.8776 -1364.0497,-1285.0586 Q -1362.8412,-1286.2671 -1362.8412,-1288.2172 Q -1362.8412,-1290.0848 -1363.8849,-1291.2384 Q -1364.9011,-1292.4194 -1366.9336,-1292.6666 Q -1368.1421,-1292.804 -1373.8824,-1292.804 L -1378.5516,-1292.804 Z M -1378.5516,-1276.7914 L -1378.5516,-1266.0248 L -1371.026,-1266.0248 Q -1366.6315,-1266.0248 -1365.4504,-1266.272 Q -1363.6377,-1266.6016 -1362.5116,-1267.865 Q -1361.358,-1269.1559 -1361.358,-1271.2982 Q -1361.358,-1273.111 -1362.2369,-1274.3744 Q -1363.1158,-1275.6378 -1364.7913,-1276.2146 Q -1366.4392,-1276.7914 -1371.9873,-1276.7914 L -1378.5516,-1276.7914 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17082-8"
|
||||||
|
d="M -1326.9159,-1259.2407 L -1326.9159,-1263.6078 Q -1328.5089,-1261.2732 -1331.1182,-1259.9274 Q -1333.7,-1258.5815 -1336.5839,-1258.5815 Q -1339.5227,-1258.5815 -1341.8573,-1259.8724 Q -1344.1919,-1261.1633 -1345.2356,-1263.4979 Q -1346.2793,-1265.8325 -1346.2793,-1269.9524 L -1346.2793,-1288.4094 L -1338.5614,-1288.4094 L -1338.5614,-1275.0061 Q -1338.5614,-1268.8538 -1338.1494,-1267.453 Q -1337.71,-1266.0797 -1336.5839,-1265.2557 Q -1335.4578,-1264.4592 -1333.7274,-1264.4592 Q -1331.7499,-1264.4592 -1330.1843,-1265.5304 Q -1328.6188,-1266.629 -1328.042,-1268.222 Q -1327.4652,-1269.8425 -1327.4652,-1276.1047 L -1327.4652,-1288.4094 L -1319.7473,-1288.4094 L -1319.7473,-1259.2407 L -1326.9159,-1259.2407 Z" />
|
||||||
|
<path
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path17084-4"
|
||||||
|
d="M -1314.4464,-1267.5629 L -1306.701,-1268.7439 Q -1306.2067,-1266.4917 -1304.696,-1265.3107 Q -1303.1854,-1264.1571 -1300.4663,-1264.1571 Q -1297.4725,-1264.1571 -1295.9619,-1265.2557 Q -1294.9457,-1266.0248 -1294.9457,-1267.3157 Q -1294.9457,-1268.1946 -1295.495,-1268.7714 Q -1296.0718,-1269.3207 -1298.0768,-1269.7876 Q -1307.4152,-1271.8475 -1309.9146,-1273.5504 Q -1313.3752,-1275.9125 -1313.3752,-1280.1147 Q -1313.3752,-1283.905 -1310.3815,-1286.4868 Q -1307.3877,-1289.0686 -1301.098,-1289.0686 Q -1295.1105,-1289.0686 -1292.1991,-1287.1185 Q -1289.2877,-1285.1685 -1288.1891,-1281.3507 L -1295.4675,-1280.0049 Q -1295.9344,-1281.7078 -1297.2528,-1282.6141 Q -1298.5437,-1283.5205 -1300.9607,-1283.5205 Q -1304.0094,-1283.5205 -1305.3278,-1282.6691 Q -1306.2067,-1282.0648 -1306.2067,-1281.1035 Q -1306.2067,-1280.2795 -1305.4376,-1279.7028 Q -1304.3939,-1278.9337 -1298.2416,-1277.533 Q -1292.0618,-1276.1322 -1289.6173,-1274.0997 Q -1287.2003,-1272.0398 -1287.2003,-1268.3594 Q -1287.2003,-1264.3494 -1290.5511,-1261.4655 Q -1293.902,-1258.5815 -1300.4663,-1258.5815 Q -1306.4264,-1258.5815 -1309.9146,-1260.9985 Q -1313.3752,-1263.4155 -1314.4464,-1267.5629 Z" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
<g
|
<g
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer63"
|
id="layer63"
|
||||||
@ -22128,6 +22495,110 @@
|
|||||||
id="tspan12026">Satellite</tspan></text>
|
id="tspan12026">Satellite</tspan></text>
|
||||||
</g>
|
</g>
|
||||||
</g>
|
</g>
|
||||||
|
<g
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer90"
|
||||||
|
inkscape:label="sparky2-ibus"
|
||||||
|
sodipodi:insensitive="true"
|
||||||
|
style="display:inline">
|
||||||
|
<g
|
||||||
|
style="display:inline"
|
||||||
|
id="sparky2-ibus"
|
||||||
|
transform="matrix(-0.4,0,0,-0.4,1133.7231,497.55198)">
|
||||||
|
<path
|
||||||
|
id="path9857-8-8-1-1-4-0-9-3-2-6-5"
|
||||||
|
d="M 1408.916,1441.5493 C 1402.946,1506.4493 1465.9756,1637.3786 1641.1435,1539.5016"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
d="M 1287.0298,1441.5493 C 1292.9998,1506.4493 1229.9702,1637.3786 1054.8023,1539.5016"
|
||||||
|
id="path21749-5-7-5-1-7-6-3" />
|
||||||
|
<rect
|
||||||
|
rx="11.5"
|
||||||
|
id="rect8853-6-8-6-6-4-6-7-9-8-6-5"
|
||||||
|
style="color:#000000;fill:url(#linearGradient16665);fill-rule:nonzero;stroke:#000000;stroke-width:5.76999998;stroke-miterlimit:4;stroke-dasharray:none;enable-background:accumulate"
|
||||||
|
ry="11.5"
|
||||||
|
height="272"
|
||||||
|
width="237"
|
||||||
|
stroke-miterlimit="4"
|
||||||
|
y="1169.5493"
|
||||||
|
x="1228.2858" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="display:inline;fill:#cccccc;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1386.7858,1166.6643 L 1386.7858,995.64237"
|
||||||
|
id="path8856-5-1-7-1-9-5-4-3-3-4-1-2" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="display:inline;fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1346.7858,1166.6643 L 1346.7858,995.64337"
|
||||||
|
id="path8856-1-2-1-9-0-3-26-2-0" />
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
style="display:inline;fill:#cccccc;stroke:#000000;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
d="M 1309.2858,1166.6643 L 1309.2858,995.64337"
|
||||||
|
id="path8856-1-5-7-7-2-9-1-6-3-2" />
|
||||||
|
<g
|
||||||
|
transform="scale(-1,-1)"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:41.27642822px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
id="text17069">
|
||||||
|
<path
|
||||||
|
d="M -1412.1475,-1323.0706 L -1412.1475,-1352.6171 L -1391.8922,-1352.6171 L -1391.8922,-1347.6187 L -1406.1817,-1347.6187 L -1406.1817,-1340.6251 L -1393.8472,-1340.6251 L -1393.8472,-1335.6268 L -1406.1817,-1335.6268 L -1406.1817,-1323.0706 L -1412.1475,-1323.0706 Z"
|
||||||
|
id="path17087"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1386.9946,-1323.0706 L -1386.9946,-1352.6171 L -1381.3312,-1352.6171 L -1381.3312,-1323.0706 L -1386.9946,-1323.0706 Z"
|
||||||
|
id="path17089"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1378.2274,-1344.4746 L -1372.2012,-1344.4746 L -1367.082,-1329.2781 L -1362.0837,-1344.4746 L -1356.2187,-1344.4746 L -1363.7767,-1323.8767 L -1365.127,-1320.1482 Q -1365.8727,-1318.2738 -1366.558,-1317.2862 Q -1367.2231,-1316.2986 -1368.1099,-1315.694 Q -1368.9765,-1315.0692 -1370.2664,-1314.7266 Q -1371.5361,-1314.384 -1373.1485,-1314.384 Q -1374.781,-1314.384 -1376.3531,-1314.7266 L -1376.8569,-1319.1606 Q -1375.5267,-1318.8986 -1374.4585,-1318.8986 Q -1372.4834,-1318.8986 -1371.5361,-1320.0675 Q -1370.5889,-1321.2163 -1370.085,-1323.0101 L -1378.2274,-1344.4746 Z"
|
||||||
|
id="path17091"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1354.2033,-1332.6843 L -1348.3988,-1333.2486 Q -1347.8747,-1330.3262 -1346.2825,-1328.9557 Q -1344.6702,-1327.5852 -1341.9493,-1327.5852 Q -1339.0672,-1327.5852 -1337.6161,-1328.7944 Q -1336.1448,-1330.0239 -1336.1448,-1331.6564 Q -1336.1448,-1332.7044 -1336.7696,-1333.43 Q -1337.3742,-1334.1757 -1338.906,-1334.7199 Q -1339.954,-1335.0826 -1343.6826,-1336.0097 Q -1348.4794,-1337.1989 -1350.4142,-1338.9322 Q -1353.1351,-1341.3708 -1353.1351,-1344.8777 Q -1353.1351,-1347.135 -1351.8653,-1349.09 Q -1350.5755,-1351.0652 -1348.1771,-1352.093 Q -1345.7585,-1353.1209 -1342.3524,-1353.1209 Q -1336.7898,-1353.1209 -1333.9883,-1350.6822 Q -1331.1667,-1348.2435 -1331.0256,-1344.1723 L -1336.9913,-1343.9103 Q -1337.3742,-1346.1878 -1338.644,-1347.1753 Q -1339.8936,-1348.1831 -1342.4129,-1348.1831 Q -1345.0128,-1348.1831 -1346.4841,-1347.1149 Q -1347.4313,-1346.4296 -1347.4313,-1345.2808 Q -1347.4313,-1344.2328 -1346.5445,-1343.4871 Q -1345.4159,-1342.5398 -1341.0625,-1341.5119 Q -1336.7091,-1340.484 -1334.6332,-1339.3756 Q -1332.5372,-1338.2872 -1331.3682,-1336.3725 Q -1330.1791,-1334.478 -1330.1791,-1331.6765 Q -1330.1791,-1329.1371 -1331.5899,-1326.9201 Q -1333.0007,-1324.7031 -1335.5805,-1323.6147 Q -1338.1603,-1322.5465 -1342.0098,-1322.5465 Q -1347.6127,-1322.5465 -1350.6158,-1325.1263 Q -1353.6188,-1327.7262 -1354.2033,-1332.6843 Z"
|
||||||
|
id="path17093"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1325.3622,-1323.0706 L -1325.3622,-1352.6171 L -1319.6987,-1352.6171 L -1319.6987,-1336.9369 L -1313.0679,-1344.4746 L -1306.0945,-1344.4746 L -1313.4105,-1336.6547 L -1305.5704,-1323.0706 L -1311.6773,-1323.0706 L -1317.0585,-1332.6843 L -1319.6987,-1329.9231 L -1319.6987,-1323.0706 L -1325.3622,-1323.0706 Z"
|
||||||
|
id="path17095"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1304.865,-1344.4746 L -1298.8388,-1344.4746 L -1293.7196,-1329.2781 L -1288.7213,-1344.4746 L -1282.8563,-1344.4746 L -1290.4143,-1323.8767 L -1291.7646,-1320.1482 Q -1292.5103,-1318.2738 -1293.1956,-1317.2862 Q -1293.8607,-1316.2986 -1294.7475,-1315.694 Q -1295.6141,-1315.0692 -1296.904,-1314.7266 Q -1298.1737,-1314.384 -1299.7861,-1314.384 Q -1301.4186,-1314.384 -1302.9907,-1314.7266 L -1303.4945,-1319.1606 Q -1302.1643,-1318.8986 -1301.0961,-1318.8986 Q -1299.121,-1318.8986 -1298.1737,-1320.0675 Q -1297.2265,-1321.2163 -1296.7226,-1323.0101 L -1304.865,-1344.4746 Z"
|
||||||
|
id="path17097"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</g>
|
||||||
|
<g
|
||||||
|
transform="scale(-1,-1)"
|
||||||
|
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:56.25px;line-height:125%;font-family:Arial;-inkscape-font-specification:'Sans Bold';letter-spacing:0px;word-spacing:0px;fill:#fdfdfd;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
|
||||||
|
id="text17073">
|
||||||
|
<path
|
||||||
|
d="M -1402.5568,-1259.2407 L -1402.5568,-1299.5056 L -1394.4269,-1299.5056 L -1394.4269,-1259.2407 L -1402.5568,-1259.2407 Z"
|
||||||
|
id="path17078"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1386.6815,-1299.5056 L -1370.5865,-1299.5056 Q -1365.8075,-1299.5056 -1363.4729,-1299.0936 Q -1361.1108,-1298.7091 -1359.2706,-1297.4457 Q -1357.403,-1296.1823 -1356.167,-1294.0674 Q -1354.931,-1291.98 -1354.931,-1289.3707 Q -1354.931,-1286.5417 -1356.4691,-1284.1797 Q -1357.9797,-1281.8176 -1360.589,-1280.6366 Q -1356.9086,-1279.5654 -1354.931,-1276.9836 Q -1352.9535,-1274.4019 -1352.9535,-1270.9137 Q -1352.9535,-1268.1671 -1354.2444,-1265.5579 Q -1355.5078,-1262.9761 -1357.7325,-1261.4105 Q -1359.9298,-1259.8724 -1363.1708,-1259.5154 Q -1365.2032,-1259.2957 -1372.9761,-1259.2407 L -1386.6815,-1259.2407 L -1386.6815,-1299.5056 Z M -1378.5516,-1292.804 L -1378.5516,-1283.493 L -1373.2233,-1283.493 Q -1368.4717,-1283.493 -1367.3181,-1283.6304 Q -1365.2307,-1283.8776 -1364.0497,-1285.0586 Q -1362.8412,-1286.2671 -1362.8412,-1288.2172 Q -1362.8412,-1290.0848 -1363.8849,-1291.2384 Q -1364.9011,-1292.4194 -1366.9336,-1292.6666 Q -1368.1421,-1292.804 -1373.8824,-1292.804 L -1378.5516,-1292.804 Z M -1378.5516,-1276.7914 L -1378.5516,-1266.0248 L -1371.026,-1266.0248 Q -1366.6315,-1266.0248 -1365.4504,-1266.272 Q -1363.6377,-1266.6016 -1362.5116,-1267.865 Q -1361.358,-1269.1559 -1361.358,-1271.2982 Q -1361.358,-1273.111 -1362.2369,-1274.3744 Q -1363.1158,-1275.6378 -1364.7913,-1276.2146 Q -1366.4392,-1276.7914 -1371.9873,-1276.7914 L -1378.5516,-1276.7914 Z"
|
||||||
|
id="path17080"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1326.9159,-1259.2407 L -1326.9159,-1263.6078 Q -1328.5089,-1261.2732 -1331.1182,-1259.9274 Q -1333.7,-1258.5815 -1336.5839,-1258.5815 Q -1339.5227,-1258.5815 -1341.8573,-1259.8724 Q -1344.1919,-1261.1633 -1345.2356,-1263.4979 Q -1346.2793,-1265.8325 -1346.2793,-1269.9524 L -1346.2793,-1288.4094 L -1338.5614,-1288.4094 L -1338.5614,-1275.0061 Q -1338.5614,-1268.8538 -1338.1494,-1267.453 Q -1337.71,-1266.0797 -1336.5839,-1265.2557 Q -1335.4578,-1264.4592 -1333.7274,-1264.4592 Q -1331.7499,-1264.4592 -1330.1843,-1265.5304 Q -1328.6188,-1266.629 -1328.042,-1268.222 Q -1327.4652,-1269.8425 -1327.4652,-1276.1047 L -1327.4652,-1288.4094 L -1319.7473,-1288.4094 L -1319.7473,-1259.2407 L -1326.9159,-1259.2407 Z"
|
||||||
|
id="path17082"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
<path
|
||||||
|
d="M -1314.4464,-1267.5629 L -1306.701,-1268.7439 Q -1306.2067,-1266.4917 -1304.696,-1265.3107 Q -1303.1854,-1264.1571 -1300.4663,-1264.1571 Q -1297.4725,-1264.1571 -1295.9619,-1265.2557 Q -1294.9457,-1266.0248 -1294.9457,-1267.3157 Q -1294.9457,-1268.1946 -1295.495,-1268.7714 Q -1296.0718,-1269.3207 -1298.0768,-1269.7876 Q -1307.4152,-1271.8475 -1309.9146,-1273.5504 Q -1313.3752,-1275.9125 -1313.3752,-1280.1147 Q -1313.3752,-1283.905 -1310.3815,-1286.4868 Q -1307.3877,-1289.0686 -1301.098,-1289.0686 Q -1295.1105,-1289.0686 -1292.1991,-1287.1185 Q -1289.2877,-1285.1685 -1288.1891,-1281.3507 L -1295.4675,-1280.0049 Q -1295.9344,-1281.7078 -1297.2528,-1282.6141 Q -1298.5437,-1283.5205 -1300.9607,-1283.5205 Q -1304.0094,-1283.5205 -1305.3278,-1282.6691 Q -1306.2067,-1282.0648 -1306.2067,-1281.1035 Q -1306.2067,-1280.2795 -1305.4376,-1279.7028 Q -1304.3939,-1278.9337 -1298.2416,-1277.533 Q -1292.0618,-1276.1322 -1289.6173,-1274.0997 Q -1287.2003,-1272.0398 -1287.2003,-1268.3594 Q -1287.2003,-1264.3494 -1290.5511,-1261.4655 Q -1293.902,-1258.5815 -1300.4663,-1258.5815 Q -1306.4264,-1258.5815 -1309.9146,-1260.9985 Q -1313.3752,-1263.4155 -1314.4464,-1267.5629 Z"
|
||||||
|
id="path17084"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
<g
|
<g
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer81"
|
id="layer81"
|
||||||
@ -22732,7 +23203,7 @@
|
|||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer72"
|
id="layer72"
|
||||||
inkscape:label="sparky2-sbus"
|
inkscape:label="sparky2-sbus"
|
||||||
style="display:inline"
|
style="display:none"
|
||||||
sodipodi:insensitive="true">
|
sodipodi:insensitive="true">
|
||||||
<g
|
<g
|
||||||
style="display:inline"
|
style="display:inline"
|
||||||
@ -41290,7 +41761,8 @@
|
|||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer79"
|
id="layer79"
|
||||||
inkscape:label="sparky2"
|
inkscape:label="sparky2"
|
||||||
style="display:inline">
|
style="display:inline"
|
||||||
|
sodipodi:insensitive="true">
|
||||||
<g
|
<g
|
||||||
style="display:inline"
|
style="display:inline"
|
||||||
transform="matrix(0.96887293,0,0,0.96887293,339.82738,-361.5986)"
|
transform="matrix(0.96887293,0,0,0.96887293,339.82738,-361.5986)"
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 4.6 MiB After Width: | Height: | Size: 4.6 MiB |
@ -394,6 +394,9 @@ QString SetupWizard::getSummaryText()
|
|||||||
case INPUT_EXBUS:
|
case INPUT_EXBUS:
|
||||||
summary.append(tr("Jeti EX.Bus"));
|
summary.append(tr("Jeti EX.Bus"));
|
||||||
break;
|
break;
|
||||||
|
case INPUT_IBUS:
|
||||||
|
summary.append(tr("FlySky IBus"));
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
summary.append(tr("Unknown"));
|
summary.append(tr("Unknown"));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -180,6 +180,9 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
|
|||||||
case VehicleConfigurationSource::INPUT_EXBUS:
|
case VehicleConfigurationSource::INPUT_EXBUS:
|
||||||
data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_EXBUS;
|
data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_EXBUS;
|
||||||
break;
|
break;
|
||||||
|
case VehicleConfigurationSource::INPUT_IBUS:
|
||||||
|
data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_IBUS;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -261,6 +264,13 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
|
|||||||
data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_EXBUS;
|
data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_EXBUS;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case VehicleConfigurationSource::INPUT_IBUS:
|
||||||
|
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_SPARKY2) {
|
||||||
|
data.SPK2_RcvrPort = HwSettings::SPK2_RCVRPORT_IBUS;
|
||||||
|
} else {
|
||||||
|
data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_IBUS;
|
||||||
|
}
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -999,6 +1009,9 @@ void VehicleConfigurationHelper::applyManualControlDefaults()
|
|||||||
case VehicleConfigurationSource::INPUT_EXBUS:
|
case VehicleConfigurationSource::INPUT_EXBUS:
|
||||||
channelType = ManualControlSettings::CHANNELGROUPS_EXBUS;
|
channelType = ManualControlSettings::CHANNELGROUPS_EXBUS;
|
||||||
break;
|
break;
|
||||||
|
case VehicleConfigurationSource::INPUT_IBUS:
|
||||||
|
channelType = ManualControlSettings::CHANNELGROUPS_IBUS;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -66,7 +66,7 @@ public:
|
|||||||
GROUNDVEHICLE_MOTORCYCLE, GROUNDVEHICLE_CAR, GROUNDVEHICLE_DIFFERENTIAL };
|
GROUNDVEHICLE_MOTORCYCLE, GROUNDVEHICLE_CAR, GROUNDVEHICLE_DIFFERENTIAL };
|
||||||
enum ESC_TYPE { ESC_ONESHOT, ESC_SYNCHED, ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN };
|
enum ESC_TYPE { ESC_ONESHOT, ESC_SYNCHED, ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN };
|
||||||
enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN };
|
enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN };
|
||||||
enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_SRXL, INPUT_HOTT_SUMD, INPUT_EXBUS, INPUT_UNKNOWN };
|
enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_SRXL, INPUT_HOTT_SUMD, INPUT_EXBUS, INPUT_IBUS, INPUT_UNKNOWN };
|
||||||
enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED };
|
enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED };
|
||||||
enum GPS_TYPE { GPS_PLATINUM, GPS_NAZA, GPS_UBX_FLEXI_I2CMAG, GPS_UBX, GPS_NMEA, GPS_DISABLED };
|
enum GPS_TYPE { GPS_PLATINUM, GPS_NAZA, GPS_UBX_FLEXI_I2CMAG, GPS_UBX, GPS_NMEA, GPS_DISABLED };
|
||||||
enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED };
|
enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED };
|
||||||
|
|||||||
@ -60,5 +60,7 @@
|
|||||||
<file>resources/bttn-hott-up.png</file>
|
<file>resources/bttn-hott-up.png</file>
|
||||||
<file>resources/bttn-exbus-down.png</file>
|
<file>resources/bttn-exbus-down.png</file>
|
||||||
<file>resources/bttn-exbus-up.png</file>
|
<file>resources/bttn-exbus-up.png</file>
|
||||||
|
<file>resources/bttn-ibus-down.png</file>
|
||||||
|
<file>resources/bttn-ibus-up.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user