rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/next' into thread/OP-1756_Multi_Motor_Calibration

Browse Source
This commit is contained in:
m_thread 2015-02-28 23:35:16 +01:00
commit c2c5d41311
17 changed files with 328 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

164
ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
View File

@ -14,7 +14,7 @@
height="79.57505"
id="svg3604"
version="1.1"
inkscape:version="0.48.4 r9939"
inkscape:version="0.48.5 r10040"
sodipodi:docname="system-health.svg"
inkscape:export-filename="C:\NoBackup\OpenPilot\mainboard-health.png"
inkscape:export-xdpi="269.53"
@ -27,10 +27,10 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.4934872"
inkscape:cx="56.515743"
inkscape:cy="39.787525"
inkscape:current-layer="background"
inkscape:zoom="6.5977991"
inkscape:cx="55.083588"
inkscape:cy="24.071773"
inkscape:current-layer="layer45"
id="namedview3608"
showgrid="true"
inkscape:window-width="1280"
@ -40,8 +40,12 @@
inkscape:window-maximized="1"
showguides="true"
inkscape:guide-bbox="true"
inkscape:snap-global="false"
units="mm">
inkscape:snap-global="true"
units="mm"
inkscape:snap-bbox="true"
inkscape:snap-bbox-midpoints="true"
inkscape:snap-nodes="false"
inkscape:snap-grids="false">
<sodipodi:guide
id="guide3857"
position="68.372091,-63.708224"
@ -687,7 +691,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
@ -696,7 +700,8 @@
transform="translate(-497.66563,-344.28037)"
id="background"
inkscape:groupmode="layer"
inkscape:label="Background">
inkscape:label="Background"
sodipodi:insensitive="true">
<rect
ry="1.6"
y="344.58401"
@ -754,14 +759,6 @@
x="499.66107"
y="360.58862"
ry="0" />
<rect
style="fill:#241c1c;fill-opacity:1;stroke:#ffffff;stroke-width:0.45410183;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
id="rect4550-8-7-82"
width="10.470912"
height="8.5405388"
x="547.97754"
y="411.27975"
ry="1" />
<rect
style="fill:#333333;fill-opacity:1;stroke:none"
id="rect1234"
@ -770,25 +767,16 @@
x="499.72488"
y="408.94675"
ry="0" />
<rect
style="fill:#28170b;fill-opacity:1;stroke:none;display:inline"
id="CPUOverload"
width="19.142458"
height="9.4961557"
x="588.72668"
y="410.80194"
ry="1.111892"
inkscape:label="#rect4550-8" />
<text
xml:space="preserve"
style="font-size:6px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Bold"
x="529.24725"
x="527.35309"
y="379.43469"
id="text5334"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan4263"
x="529.24725"
x="527.35309"
y="379.43469">SYSTEM HEALTH</tspan></text>
<text
xml:space="preserve"
@ -918,8 +906,8 @@
id="Airspeed"
width="23.751532"
height="10.102088"
x="557.14178"
y="362.48087"
x="557.61102"
y="362.46414"
ry="0.99014992"
inkscape:label="#rect4550-8-1-4-21-5-13" />
<rect
@ -1005,6 +993,15 @@
y="410.80194"
ry="1.111892"
inkscape:label="#rect4550-8" />
<rect
style="fill:#28170b;fill-opacity:1;stroke:none;display:inline"
id="CPUOverload"
width="19.142458"
height="9.4961557"
x="588.72668"
y="410.80194"
ry="1.111892"
inkscape:label="#rect4550-8" />
<rect
style="fill:#28170b;fill-opacity:1;stroke:none;display:inline"
id="EventSystem"
@ -1674,6 +1671,50 @@
inkscape:label="#rect4550"
rx="1.2054718" />
</g>
<g
inkscape:groupmode="layer"
id="layer45"
inkscape:label="BootFault-RebootRequired">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="BootFault-RebootRequired"
width="13.110236"
height="10.107105"
x="80.806435"
y="51.972187"
ry="0.98050147"
inkscape:label="#rect4550-8-1-4-21-1" />
</g>
<g
inkscape:groupmode="layer"
id="layer43"
inkscape:label="SystemConfiguration-FlightMode"
style="display:inline">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="SystemConfiguration-FlightMode"
width="13.110236"
height="10.107105"
x="80.806435"
y="51.972187"
ry="0.98050147"
inkscape:label="#rect4550-8-1-4-21-1" />
</g>
<g
inkscape:groupmode="layer"
id="layer44"
inkscape:label="SystemConfiguration-UnsupportedConfig_OneShot"
style="display:none">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="SystemConfiguration-UnsupportedConfig_OneShot"
width="13.110236"
height="10.107105"
x="80.775131"
y="51.938683"
ry="0.98050147"
inkscape:label="#rect4550-8-1-4-21-1" />
</g>
<g
inkscape:groupmode="layer"
id="g5417"
@ -1798,7 +1839,8 @@
inkscape:groupmode="layer"
id="g5438"
inkscape:label="SystemConfiguration-Critical"
style="display:none">
style="display:none"
sodipodi:insensitive="true">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="SystemConfiguration-Critical"
@ -1813,7 +1855,8 @@
inkscape:groupmode="layer"
id="g5441"
inkscape:label="BootFault-Critical"
style="display:none">
style="display:none"
sodipodi:insensitive="true">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="BootFault-Critical"
@ -1827,7 +1870,8 @@
inkscape:groupmode="layer"
id="g5445"
inkscape:label="Battery-Critical"
style="display:none">
style="display:none"
sodipodi:insensitive="true">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="Battery-Critical"
@ -1842,7 +1886,8 @@
inkscape:groupmode="layer"
id="g5448"
inkscape:label="Telemetry-Critical"
style="display:none">
style="display:none"
sodipodi:insensitive="true">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="Telemetry-Critical"
@ -1857,7 +1902,8 @@
inkscape:groupmode="layer"
id="g5451"
inkscape:label="FlightTime-Critical"
style="display:none">
style="display:none"
sodipodi:insensitive="true">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="FlightTime-Critical"
@ -1872,7 +1918,8 @@
inkscape:groupmode="layer"
id="g5454"
inkscape:label="I2C-Critical"
style="display:none">
style="display:none"
sodipodi:insensitive="true">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="I2C-Critical"
@ -1887,7 +1934,8 @@
inkscape:groupmode="layer"
id="g5457"
inkscape:label="EventSystem-Critical"
style="display:none">
style="display:none"
sodipodi:insensitive="true">
<rect
style="fill:#d40000;fill-opacity:1;stroke:none;display:inline"
id="EventSystem-Critical"
@ -2282,13 +2330,13 @@
<path
inkscape:connector-curvature="0"
id="path6233-9-9-86-6"
d="m 55.345762,52.390536 22.271395,9.258692"
d="M 55.345762,52.390536 L 77.617157,61.649228"
style="fill:#ff0000;stroke:#ff0000;stroke-width:1.36421418;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:none;display:inline"
sodipodi:nodetypes="cc" />
<path
inkscape:connector-curvature="0"
id="path6233-9-9-4-5-1"
d="M 55.34692,61.535992 77.626653,52.32014"
d="M 55.34692,61.535992 L 77.626653,52.32014"
style="fill:#ff0000;stroke:#ff0000;stroke-width:1.36357629;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-end:none;display:inline"
sodipodi:nodetypes="cc" />
</g>
@ -2439,7 +2487,8 @@
style="display:inline"
inkscape:label="Foreground"
id="foreground"
inkscape:groupmode="layer">
inkscape:groupmode="layer"
sodipodi:insensitive="true">
<rect
inkscape:label="#rect3054"
style="fill:none;stroke:#000000;stroke-width:1.09511685;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
@ -2479,19 +2528,19 @@
style="font-size:6px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial Bold"
id="text5330-7-7">
<path
d="m 20.933331,9.2802429 -0.94336,0 -0.375,-0.9755859 -1.716797,0 -0.354492,0.9755859 -0.919922,0 1.672852,-4.2949219 0.916992,0 1.719727,4.2949219 m -1.59668,-1.6992187 -0.591797,-1.59375 -0.580078,1.59375 1.171875,0"
d="M 20.933331,9.2802429 L 19.989971,9.2802429 L 19.614971,8.304657 L 17.898174,8.304657 L 17.543682,9.2802429 L 16.62376,9.2802429 L 18.296612,4.985321 L 19.213604,4.985321 L 20.933331,9.2802429 M 19.336651,7.5810242 L 18.744854,5.9872742 L 18.164776,7.5810242 L 19.336651,7.5810242"
id="path4659"
inkscape:connector-curvature="0" />
<path
d="m 21.929424,9.2802429 0,-3.5683594 -1.274414,0 0,-0.7265625 3.413086,0 0,0.7265625 -1.271484,0 0,3.5683594 -0.867188,0"
d="M 21.929424,9.2802429 L 21.929424,5.7118835 L 20.65501,5.7118835 L 20.65501,4.985321 L 24.068096,4.985321 L 24.068096,5.7118835 L 22.796612,5.7118835 L 22.796612,9.2802429 L 21.929424,9.2802429"
id="path4661"
inkscape:connector-curvature="0" />
<path
d="m 25.585674,9.2802429 0,-3.5683594 -1.274414,0 0,-0.7265625 3.413086,0 0,0.7265625 -1.271484,0 0,3.5683594 -0.867188,0"
d="M 25.585674,9.2802429 L 25.585674,5.7118835 L 24.31126,5.7118835 L 24.31126,4.985321 L 27.724346,4.985321 L 27.724346,5.7118835 L 26.452862,5.7118835 L 26.452862,9.2802429 L 25.585674,9.2802429"
id="path4663"
inkscape:connector-curvature="0" />
<path
d="m 28.24876,9.2802429 0,-4.2949219 0.867188,0 0,4.2949219 -0.867188,0"
d="M 28.24876,9.2802429 L 28.24876,4.985321 L 29.115948,4.985321 L 29.115948,9.2802429 L 28.24876,9.2802429"
id="path4665"
inkscape:connector-curvature="0" />
</g>
@ -2903,6 +2952,17 @@
width="13.522519"
id="rect4796-2-7-4-0"
style="fill:none;stroke:#ffffff;stroke-width:0.70866144;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
<text
xml:space="preserve"
style="font-size:7.38898897px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Sans Bold"
x="85.050056"
y="59.663887"
id="text3468"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3470"
x="85.050056"
y="59.663887">?</tspan></text>
</g>
<g
inkscape:groupmode="layer"
@ -2948,12 +3008,12 @@
id="g4267">
<path
style="fill:none;stroke:#000000;stroke-width:0.29055119;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 10,34.57505 3,-5 3,5 z"
d="M 10,34.57505 L 13,29.57505 L 16,34.57505 z"
id="path4256"
inkscape:connector-curvature="0" />
<path
style="fill:#feff4e;fill-opacity:1;stroke:none"
d="m 10.290063,34.407528 c 0.0054,-0.0098 0.6154,-1.028176 1.355653,-2.263122 1.065577,-1.777675 1.351802,-2.238983 1.374175,-2.214756 0.034,0.03682 2.687605,4.461874 2.687605,4.481753 0,0.0076 -1.221113,0.01389 -2.713585,0.01389 -1.492472,0 -2.709203,-0.008 -2.703848,-0.01777 z"
d="M 10.290063,34.407528 C 10.295463,34.397728 10.905463,33.379352 11.645716,32.144406 C 12.711293,30.366731 12.997518,29.905423 13.019891,29.92965 C 13.053891,29.96647 15.707496,34.391524 15.707496,34.411403 C 15.707496,34.419003 14.486383,34.425293 12.993911,34.425293 C 11.501439,34.425293 10.284708,34.417293 10.290063,34.407523 z"
id="path4258"
inkscape:connector-curvature="0" />
<path
@ -2964,14 +3024,14 @@
sodipodi:cy="35.07505"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 14,35.07505 a 0.5,0.5 0 1 1 -2.75e-4,-0.01658"
d="M 14,35.07505 A 0.5,0.5 0 1 1 13.999725,35.058469"
sodipodi:start="0"
sodipodi:end="6.2500167"
sodipodi:open="true"
transform="matrix(0.85787666,0,0,0.89340749,1.4093898,2.5721417)" />
<path
style="fill:none;stroke:#000000;stroke-width:0.78661418;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 13,30.727043 0,2.607972"
d="M 13,30.727043 L 13,33.335015"
id="path4265"
inkscape:connector-curvature="0" />
</g>
@ -2981,12 +3041,12 @@
style="display:inline">
<path
style="fill:none;stroke:#000000;stroke-width:0.29024163;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 10,34.57505 3,-5 3,5 z"
d="M 10,34.57505 L 13,29.57505 L 16,34.57505 z"
id="path4256-0"
inkscape:connector-curvature="0" />
<path
style="fill:#feff4e;fill-opacity:1;stroke:none"
d="m 10.290063,34.407528 c 0.0054,-0.0098 0.6154,-1.028176 1.355653,-2.263122 1.065577,-1.777675 1.351802,-2.238983 1.374175,-2.214756 0.034,0.03682 2.687605,4.461874 2.687605,4.481753 0,0.0076 -1.221113,0.01389 -2.713585,0.01389 -1.492472,0 -2.709203,-0.008 -2.703848,-0.01777 z"
d="M 10.290063,34.407528 C 10.295463,34.397728 10.905463,33.379352 11.645716,32.144406 C 12.711293,30.366731 12.997518,29.905423 13.019891,29.92965 C 13.053891,29.96647 15.707496,34.391524 15.707496,34.411403 C 15.707496,34.419003 14.486383,34.425293 12.993911,34.425293 C 11.501439,34.425293 10.284708,34.417293 10.290063,34.407523 z"
id="path4258-9"
inkscape:connector-curvature="0" />
<path
@ -2997,14 +3057,14 @@
sodipodi:cy="35.07505"
sodipodi:rx="0.5"
sodipodi:ry="0.5"
d="m 14,35.07505 a 0.5,0.5 0 1 1 -2.75e-4,-0.01658"
d="M 14,35.07505 A 0.5,0.5 0 1 1 13.999725,35.058469"
sodipodi:start="0"
sodipodi:end="6.2500167"
sodipodi:open="true"
transform="matrix(0.85787666,0,0,0.89340749,1.4093898,2.5721417)" />
<path
style="fill:none;stroke:#000000;stroke-width:0.78661418;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 13,30.727043 0,2.607972"
d="M 13,30.727043 L 13,33.335015"
id="path4265-8"
inkscape:connector-curvature="0" />
</g>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 106 KiB

After

Width:  |  Height:  |  Size: 109 KiB

6
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configccpmwidget.cpp
View File

@ -398,7 +398,7 @@ void ConfigCcpmWidget::UpdateType()
// Clear advanced settings table if not Custom selected (Keep previous settings)
if (TypeText.compare(QString::fromUtf8("Custom - Advanced Settings"), Qt::CaseInsensitive) != 0) {
m_aircraft->ccpmAdvancedSettingsTable->clearFocus();
m_aircraft->ccpmAdvancedSettingsTable->clearFocus();
}
m_aircraft->ccpmAngleW->setEnabled(TypeInt == 1);
@ -695,7 +695,7 @@ void ConfigCcpmWidget::UpdateMixer()
;
}
}
int TypeInt = m_aircraft->ccpmType->count() - m_aircraft->ccpmType->currentIndex() - 1;
int TypeInt = m_aircraft->ccpmType->count() - m_aircraft->ccpmType->currentIndex() - 1;
if (TypeInt != 0) { // not advanced settings
// get the channel data from the ui
MixerChannelData[0] = m_aircraft->ccpmEngineChannel->currentIndex();
@ -796,7 +796,7 @@ void ConfigCcpmWidget::UpdateMixer()
Channel = QString((int)ConfigCcpmWidget::CHANNEL_NUMELEM + 1);
}
MixerChannelData[i] = Channel.toInt();
}
}
}
}

3
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
View File

@ -167,7 +167,8 @@ void ConnectionDiagram::setupGraphicsScene()
case VehicleConfigurationSource::CONTROLLER_CC:
case VehicleConfigurationSource::CONTROLLER_CC3D:
prefix = "cc-";
if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT) {
if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT ||
m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) {
suffix = "-oneshot";
}
break;

22
ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.cpp
View File

@ -169,15 +169,11 @@ bool AirframeInitialTuningPage::airframeIsCompatible(int vehicleType, int vehicl
}
}
void AirframeInitialTuningPage::loadValidFiles()
void AirframeInitialTuningPage::loadFilesInDir(QString templateBasePath)
{
ui->templateList->clear();
foreach(QJsonObject * templ, m_templates.values()) {
delete templ;
}
m_templates.clear();
QDir templateDir(templateBasePath);
QDir templateDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(m_dir));
qDebug() << "Loading templates from base path:" << templateBasePath;
QStringList names;
names << "*.optmpl";
templateDir.setNameFilters(names);
@ -207,6 +203,18 @@ void AirframeInitialTuningPage::loadValidFiles()
}
}
void AirframeInitialTuningPage::loadValidFiles()
{
ui->templateList->clear();
foreach(QJsonObject * templ, m_templates.values()) {
delete templ;
}
m_templates.clear();
loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(m_dir));
loadFilesInDir(QString("%1/%2/").arg(Utils::PathUtils().InsertStoragePath("%%STOREPATH%%cloudconfig")).arg(m_dir));
}
void AirframeInitialTuningPage::setupTemplateList()
{
QListWidgetItem *item;

2
ground/openpilotgcs/src/plugins/setupwizard/pages/airframeinitialtuningpage.h
View File

@ -44,7 +44,6 @@ public:
void initializePage();
bool validatePage();
bool isComplete() const;
public slots:
void templateSelectionChanged();
@ -59,6 +58,7 @@ private:
QGraphicsPixmapItem *m_photoItem;
void loadValidFiles();
void loadFilesInDir(QString templateBasePath);
void setupTemplateList();
QString getTemplateKey(QJsonObject *templ);
void updatePhoto(QJsonObject *templ);

4
ground/openpilotgcs/src/plugins/setupwizard/pages/savepage.cpp
View File

@ -80,6 +80,10 @@ void SavePage::writeToController()
enableButtons(true);
emit completeChanged();
if (m_successfulWrite) {
getWizard()->next();
}
}
void SavePage::enableButtons(bool enable)

159
ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
View File

@ -30,13 +30,13 @@
inkscape:window-height="928"
id="namedview4616"
showgrid="false"
inkscape:zoom="1.9844144"
inkscape:cx="236.10597"
inkscape:cy="505.93946"
inkscape:zoom="0.70159644"
inkscape:cx="305.10274"
inkscape:cy="632.28327"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="layer12"
inkscape:current-layer="layer17"
fit-margin-top="15"
fit-margin-left="15"
fit-margin-right="15"
@ -18146,7 +18146,7 @@
sodipodi:insensitive="true">
<g
style="display:inline"
id="sbus"
id="revo-sbus"
transform="matrix(0.4,0,0,0.4,53.475,-98.70912)">
<path
id="path9857-8-5-2"
@ -18221,47 +18221,46 @@
</g>
</g>
<g
sodipodi:insensitive="true"
style="display:none"
inkscape:label="revo-satellite"
id="g11310"
inkscape:groupmode="layer">
<g
transform="matrix(0.4,0,0,0.4,-131.04473,-97.93132)"
id="g11312">
id="revo-satellite">
<path
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 1250,1530 c -64.9,-5.97 -121,14.3 -171,40.7"
d="M 1250,1530 C 1185.1,1524.03 1129,1544.3 1079,1570.7"
id="path11315" />
<path
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 1490,1530 c 50.3,-1.09 115,5.3 155,36.6"
d="M 1490,1530 C 1540.3,1528.91 1605,1535.3 1645,1566.6"
id="path11317" />
<path
id="path11319"
d="m 1371.2889,1318.8556 0,-124.7594 225,0 0,-141.368"
d="M 1371.2889,1318.8556 L 1371.2889,1194.0962 L 1596.2889,1194.0962 L 1596.2889,1052.7282"
inkscape:connector-curvature="0"
style="fill:none;stroke:#1f4697;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" />
<path
id="path11321"
d="m 1356.2889,1318.8556 0,-139.7594 225,0 0,-126.368"
d="M 1356.2889,1318.8556 L 1356.2889,1179.0962 L 1581.2889,1179.0962 L 1581.2889,1052.7282"
inkscape:connector-curvature="0"
style="fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" />
<path
id="path11323"
d="m 1386.2889,1318.8556 0,-109.7594 225.5,10e-5 0,-156.3681"
d="M 1386.2889,1318.8556 L 1386.2889,1209.0962 L 1611.7889,1209.0963 L 1611.7889,1052.7282"
inkscape:connector-curvature="0"
style="fill:none;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" />
<path
id="path11325"
d="m 1342.571,1318.8556 0,-154.7594 223.7179,0 0,-111.368"
d="M 1342.571,1318.8556 L 1342.571,1164.0962 L 1566.2889,1164.0962 L 1566.2889,1052.7282"
inkscape:connector-curvature="0"
style="fill:none;stroke:#000000;stroke-width:15.30000019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" />
@ -18861,7 +18860,7 @@
inkscape:groupmode="layer">
<g
transform="matrix(0.4,0,0,0.4,53.475,-98.70912)"
id="g11325"
id="cc-sbus"
style="display:inline">
<path
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
@ -18942,17 +18941,17 @@
style="display:none"
sodipodi:insensitive="true">
<g
id="satellite"
id="cc-satellite"
transform="matrix(0.4,0,0,0.4,-131.04473,-97.93132)">
<path
id="path9857-8"
d="m 1250,1530 c -64.9,-5.97 -121,14.3 -171,40.7"
d="M 1250,1530 C 1185.1,1524.03 1129,1544.3 1079,1570.7"
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" />
<path
id="path9857-8-5"
d="m 1490,1530 c 50.3,-1.09 115,5.3 155,36.6"
d="M 1490,1530 C 1540.3,1528.91 1605,1535.3 1645,1566.6"
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" />
@ -18960,25 +18959,25 @@
sodipodi:nodetypes="cccc"
style="fill:none;stroke:#1f4697;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0"
d="m 1371.2889,1318.8556 0,-124.7594 225,0 0,-141.368"
d="M 1371.2889,1318.8556 L 1371.2889,1194.0962 L 1596.2889,1194.0962 L 1596.2889,1052.7282"
id="path8856-5-6" />
<path
sodipodi:nodetypes="cccc"
style="fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0"
d="m 1356.2889,1318.8556 0,-139.7594 225,0 0,-126.368"
d="M 1356.2889,1318.8556 L 1356.2889,1179.0962 L 1581.2889,1179.0962 L 1581.2889,1052.7282"
id="path8856-1-2" />
<path
sodipodi:nodetypes="cccc"
style="fill:none;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0"
d="m 1386.2889,1318.8556 0,-109.7594 225.5,10e-5 0,-156.3681"
d="M 1386.2889,1318.8556 L 1386.2889,1209.0962 L 1611.7889,1209.0963 L 1611.7889,1052.7282"
id="path8856-5-1-7-1-9" />
<path
sodipodi:nodetypes="cccc"
style="fill:none;stroke:#000000;stroke-width:15.30000019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
inkscape:connector-curvature="0"
d="m 1342.571,1318.8556 0,-154.7594 223.7179,0 0,-111.368"
d="M 1342.571,1318.8556 L 1342.571,1164.0962 L 1566.2889,1164.0962 L 1566.2889,1052.7282"
id="path8856-1-5-7" />
<rect
rx="11.5"
@ -19544,11 +19543,11 @@
<g
inkscape:groupmode="layer"
id="layer23"
inkscape:label="generic-nmea"
inkscape:label="revo-generic-nmea"
style="display:none"
sodipodi:insensitive="true">
<g
id="generic-nmea">
id="revo-generic-nmea">
<g
id="g14377"
transform="matrix(0,0.77129601,-0.77129601,0,1404.0461,377.01359)">
@ -20431,11 +20430,11 @@
<g
inkscape:groupmode="layer"
id="layer28"
inkscape:label="OPGPS-v8-ublox"
inkscape:label="revo-OPGPS-v8-ublox"
style="display:none"
sodipodi:insensitive="true">
<g
id="OPGPS-v8-ublox">
id="revo-OPGPS-v8-ublox">
<path
sodipodi:nodetypes="ccccc"
style="fill:none;stroke:#1f4697;stroke-width:6.11999989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
@ -20578,7 +20577,7 @@
</g>
<path
transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,553.33859)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -20594,7 +20593,7 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,0.40146247,-0.40146247,0,819.07458,553.33859)" />
<path
sodipodi:type="arc"
@ -20604,11 +20603,11 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,750.0552)" />
<path
transform="matrix(0,0.40146247,-0.40146247,0,819.07458,750.0552)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -20732,11 +20731,11 @@
<g
inkscape:groupmode="layer"
id="layer36"
inkscape:label="OPGPS-v9"
style="display:none"
inkscape:label="revo-OPGPS-v9"
style="display:inline"
sodipodi:insensitive="true">
<g
id="OPGPS-v9">
id="revo-OPGPS-v9">
<rect
id="rect14138-8-9-5"
x="620.07581"
@ -20757,11 +20756,11 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,-0.40146247,0.40146247,0,260.05873,720.82148)" />
<path
transform="matrix(0,-0.40146247,0.40146247,0,260.05873,524.10489)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -20885,7 +20884,7 @@
</g>
<path
transform="matrix(0,-0.40146247,0.40146247,0,456.77534,720.82148)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -20901,7 +20900,7 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,-0.40146247,0.40146247,0,456.77534,524.10489)" />
<rect
id="rect7428"
@ -22804,13 +22803,13 @@
<g
inkscape:groupmode="layer"
id="layer5"
inkscape:label="flexi-generic-nmea"
style="display:inline"
inkscape:label="flexi-revo-generic-nmea"
style="display:none"
sodipodi:insensitive="true">
<g
transform="translate(-248,4.5990295e-6)"
style="display:inline"
id="flexi-generic-nmea">
id="flexi-revo-generic-nmea">
<g
id="g14377-12"
transform="matrix(0,0.77129601,-0.77129601,0,1404.0461,377.01359)">
@ -23699,7 +23698,7 @@
<g
transform="translate(-340,4.6e-6)"
style="display:inline"
id="flexi-OPGPS-v8-ublox">
id="flexi-revo-OPGPS-v8-ublox">
<path
sodipodi:nodetypes="cccc"
style="fill:none;stroke:#000000;stroke-width:6.11999989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
@ -23842,7 +23841,7 @@
</g>
<path
transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,553.33859)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -23858,7 +23857,7 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,0.40146247,-0.40146247,0,819.07458,553.33859)" />
<path
sodipodi:type="arc"
@ -23868,11 +23867,11 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,750.0552)" />
<path
transform="matrix(0,0.40146247,-0.40146247,0,819.07458,750.0552)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -23996,13 +23995,13 @@
<g
inkscape:groupmode="layer"
id="layer9"
inkscape:label="flexi-OPGPS-v9"
inkscape:label="flexi-revo-OPGPS-v9"
style="display:none"
sodipodi:insensitive="true">
<g
transform="translate(-240,4.5990295e-6)"
style="display:inline"
id="flexi-OPGPS-v9">
id="flexi-revo-OPGPS-v9">
<rect
id="rect14138-8-9-5-5"
x="620.07581"
@ -24023,11 +24022,11 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,-0.40146247,0.40146247,0,260.05873,720.82148)" />
<path
transform="matrix(0,-0.40146247,0.40146247,0,260.05873,524.10489)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -24151,7 +24150,7 @@
</g>
<path
transform="matrix(0,-0.40146247,0.40146247,0,456.77534,720.82148)"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
sodipodi:ry="23.877298"
sodipodi:rx="23.877298"
sodipodi:cy="572.3067"
@ -24167,7 +24166,7 @@
sodipodi:cy="572.3067"
sodipodi:rx="23.877298"
sodipodi:ry="23.877298"
d="M -12.73456,572.3067 C -12.73456,585.49377 -23.424791,596.184 -36.611858,596.184 C -49.798926,596.184 -60.489157,585.49377 -60.489157,572.3067 C -60.489157,559.11963 -49.798926,548.4294 -36.611858,548.4294 C -23.424791,548.4294 -12.73456,559.11963 -12.73456,572.3067 z"
d="M -12.73456,572.3067 A 23.877298,23.877298 0 1 1 -60.489157,572.3067 A 23.877298,23.877298 0 1 1 -12.73456,572.3067 z"
transform="matrix(0,-0.40146247,0.40146247,0,456.77534,524.10489)" />
<rect
id="rect7428-5"
@ -24357,9 +24356,9 @@
<polygon
transform="matrix(1.5711089,0,0,1.5372108,235.33403,522.2062)"
id="polygon8706-1-0"
points="186.194,11.031 181.129,13.319 186.083,4.74 191.036,13.319 " />
points="186.083,4.74 191.036,13.319 186.194,11.031 181.129,13.319 " />
<polygon
points="191.036,13.319 186.194,11.031 181.129,13.319 186.083,4.74 "
points="181.129,13.319 186.083,4.74 191.036,13.319 186.194,11.031 "
id="polygon10148-4"
transform="matrix(1.5711089,0,0,1.5372108,357.19879,522.2062)" />
<g
@ -26082,7 +26081,7 @@
<g
inkscape:groupmode="layer"
id="layer40"
inkscape:label="nano-ms4525"
inkscape:label="nano-ms4525-speed-sensor"
style="display:none"
sodipodi:insensitive="true">
<g
@ -26575,7 +26574,7 @@
<polygon
style="fill-rule:evenodd"
id="polygon13-5"
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="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 251.619,485.734 " />
<path
style="fill-rule:evenodd"
id="path15-2"
@ -26589,7 +26588,7 @@
<polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19-3"
points="253.082,364.946 253.082,454.937 220.283,454.937 220.283,364.946 220.283,364.946 " />
points="253.082,454.937 220.283,454.937 220.283,364.946 220.283,364.946 253.082,364.946 " />
<path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21-6"
@ -26598,7 +26597,7 @@
<polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23-6"
points="225.505,449.298 247.754,449.298 247.754,370.688 225.505,370.688 225.505,370.688 " />
points="247.754,449.298 247.754,370.688 225.505,370.688 225.505,370.688 225.505,449.298 " />
<path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25-2"
@ -26615,7 +26614,7 @@
<g
inkscape:groupmode="layer"
id="layer41"
inkscape:label="nano-eagletree"
inkscape:label="nano-eagletree-speed-sensor"
style="display:none"
sodipodi:insensitive="true">
<g
@ -26779,7 +26778,7 @@
style="fill:#df181b;fill-opacity:1;stroke:#000000;stroke-width:0.77129602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
transform="matrix(0.77129601,0,0,0.77129601,324.31484,-346.34006)"
d="M 379.6109,501.66602 C 379.6109,504.54173 377.16866,506.87296 374.15601,506.87296 C 371.14335,506.87296 368.70111,504.54173 368.70111,501.66602 C 368.70111,498.7903 371.14335,496.45907 374.15601,496.45907 C 377.16866,496.45907 379.6109,498.7903 379.6109,501.66602 z"
d="M 379.6109,501.66602 A 5.4548922,5.2069426 0 1 1 368.70111,501.66602 A 5.4548922,5.2069426 0 1 1 379.6109,501.66602 z"
sodipodi:ry="5.2069426"
sodipodi:rx="5.4548922"
sodipodi:cy="501.66602"
@ -27589,7 +27588,7 @@
id="path8856-5-6-5-6-7-2-87-6-9" />
<path
transform="translate(-136.3084,-443.63428)"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
sodipodi:ry="5.1442995"
sodipodi:rx="5.1442995"
sodipodi:cy="483.271"
@ -27605,11 +27604,11 @@
sodipodi:cy="483.271"
sodipodi:rx="5.1442995"
sodipodi:ry="5.1442995"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
transform="translate(-136.3084,-463.68797)" />
<path
transform="translate(-136.3084,-481.68799)"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
sodipodi:ry="5.1442995"
sodipodi:rx="5.1442995"
sodipodi:cy="483.271"
@ -27625,7 +27624,7 @@
sodipodi:cy="483.271"
sodipodi:rx="5.1442995"
sodipodi:ry="5.1442995"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
transform="translate(-136.3084,-501.68802)" />
<g
id="g9542-2-1"
@ -27726,7 +27725,7 @@
<polygon
style="fill-rule:evenodd"
id="polygon13-5-7"
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="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 251.619,485.734 " />
<path
style="fill-rule:evenodd"
id="path15-2-6"
@ -27740,7 +27739,7 @@
<polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19-3-9"
points="253.082,454.937 220.283,454.937 220.283,364.946 220.283,364.946 253.082,364.946 " />
points="220.283,454.937 220.283,364.946 220.283,364.946 253.082,364.946 253.082,454.937 " />
<path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21-6-0"
@ -27749,7 +27748,7 @@
<polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23-6-4"
points="247.754,449.298 247.754,370.688 225.505,370.688 225.505,370.688 225.505,449.298 " />
points="247.754,370.688 225.505,370.688 225.505,370.688 225.505,449.298 247.754,449.298 " />
<path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25-2-1"
@ -27766,11 +27765,11 @@
<g
inkscape:groupmode="layer"
id="layer42"
inkscape:label="ms4525"
inkscape:label="revo-ms4525-speed-sensor"
style="display:none"
sodipodi:insensitive="true">
<g
id="ms4525-speed-sensor">
id="revo-ms4525-speed-sensor">
<path
id="rect3287-1"
d="M 279.15532,401.95962 L 446.45368,401.95962 C 447.73557,401.95962 448.76756,402.99162 448.76756,404.27351 L 448.76756,516.11183 C 448.76756,517.39373 447.73557,518.42572 446.45368,518.42572 L 279.15532,518.42572 C 277.87342,518.42572 276.84143,517.39373 276.84143,516.11183 L 276.84143,404.27351 C 276.84143,402.99162 277.87342,401.95962 279.15532,401.95962 z"
@ -28179,7 +28178,7 @@
<polygon
style="fill-rule:evenodd"
id="polygon13"
points="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 251.619,485.734 242.74,485.734 " />
points="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 251.619,480.095 " />
<path
style="fill-rule:evenodd"
id="path15"
@ -28193,7 +28192,7 @@
<polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19"
points="220.283,364.946 253.082,364.946 253.082,454.937 220.283,454.937 220.283,364.946 " />
points="253.082,454.937 220.283,454.937 220.283,364.946 220.283,364.946 253.082,364.946 " />
<path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21"
@ -28202,7 +28201,7 @@
<polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23"
points="225.505,370.688 225.505,449.298 247.754,449.298 247.754,370.688 225.505,370.688 " />
points="247.754,449.298 247.754,370.688 225.505,370.688 225.505,370.688 225.505,449.298 " />
<path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25"
@ -28296,11 +28295,11 @@
<g
inkscape:groupmode="layer"
id="layer43"
inkscape:label="eagletree"
inkscape:label="revo-eagletree-speed-sensor"
style="display:none"
sodipodi:insensitive="true">
<g
id="eagletree-speed-sensor">
id="revo-eagletree-speed-sensor">
<g
transform="matrix(0.77129601,0,0,0.77129601,-4.0324,89.181843)"
id="g6563-8">
@ -28460,7 +28459,7 @@
style="fill:#df181b;fill-opacity:1;stroke:#000000;stroke-width:0.77129602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
transform="matrix(0.77129601,0,0,0.77129601,-4.0324,147.80034)"
d="M 379.6109,501.66602 C 379.6109,504.54173 377.16866,506.87296 374.15601,506.87296 C 371.14335,506.87296 368.70111,504.54173 368.70111,501.66602 C 368.70111,498.7903 371.14335,496.45907 374.15601,496.45907 C 377.16866,496.45907 379.6109,498.7903 379.6109,501.66602 z"
d="M 379.6109,501.66602 A 5.4548922,5.2069426 0 1 1 368.70111,501.66602 A 5.4548922,5.2069426 0 1 1 379.6109,501.66602 z"
sodipodi:ry="5.2069426"
sodipodi:rx="5.4548922"
sodipodi:cy="501.66602"
@ -29270,7 +29269,7 @@
id="path8856-5-6-5-6-7-2-87-6-9-8" />
<path
transform="translate(-465.89215,50.457722)"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
sodipodi:ry="5.1442995"
sodipodi:rx="5.1442995"
sodipodi:cy="483.271"
@ -29286,11 +29285,11 @@
sodipodi:cy="483.271"
sodipodi:rx="5.1442995"
sodipodi:ry="5.1442995"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
transform="translate(-465.89215,30.404033)" />
<path
transform="translate(-465.89215,12.404008)"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
sodipodi:ry="5.1442995"
sodipodi:rx="5.1442995"
sodipodi:cy="483.271"
@ -29306,7 +29305,7 @@
sodipodi:cy="483.271"
sodipodi:rx="5.1442995"
sodipodi:ry="5.1442995"
d="M 656.58418,483.271 C 656.58418,486.11211 654.281,488.4153 651.43988,488.4153 C 648.59876,488.4153 646.29558,486.11211 646.29558,483.271 C 646.29558,480.42988 648.59876,478.1267 651.43988,478.1267 C 654.281,478.1267 656.58418,480.42988 656.58418,483.271 z"
d="M 656.58418,483.271 A 5.1442995,5.1442995 0 1 1 646.29558,483.271 A 5.1442995,5.1442995 0 1 1 656.58418,483.271 z"
transform="translate(-465.89215,-7.5960203)" />
<g
id="g9542-2-1-6"
@ -29407,7 +29406,7 @@
<polygon
style="fill-rule:evenodd"
id="polygon13-5-7-1"
points="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 242.74,467.777 251.619,467.777 251.619,467.777 " />
points="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 242.74,467.777 251.619,467.777 251.619,467.777 251.619,460.783 233.13,460.783 " />
<path
style="fill-rule:evenodd"
id="path15-2-6-3"
@ -29421,7 +29420,7 @@
<polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19-3-9-3"
points="253.082,454.937 220.283,454.937 220.283,364.946 220.283,364.946 253.082,364.946 " />
points="220.283,364.946 220.283,364.946 253.082,364.946 253.082,454.937 220.283,454.937 " />
<path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21-6-0-1"
@ -29430,7 +29429,7 @@
<polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23-6-4-7"
points="247.754,449.298 247.754,370.688 225.505,370.688 225.505,370.688 225.505,449.298 " />
points="225.505,370.688 225.505,370.688 225.505,449.298 247.754,449.298 247.754,370.688 " />
<path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25-2-1-5"

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

12
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -150,7 +150,8 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PWMNOONESHOT;
break;
case VehicleConfigurationSource::INPUT_PPM:
if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT) {
if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT ||
m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) {
data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PPM_PIN8ONESHOT;
} else {
data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PPMNOONESHOT;
@ -376,18 +377,19 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
bankMode = ActuatorSettings::BANKMODE_PWM;
break;
case VehicleConfigurationSource::ESC_RAPID:
escFrequence = RAPID_ESC_FREQUENCY;
if ((m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC ||
m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC3D) &&
m_configSource->getInputType() == VehicleConfigurationSource::INPUT_PWM) {
bankMode = ActuatorSettings::BANKMODE_PWM;
bankMode = ActuatorSettings::BANKMODE_PWM;
escFrequence = RAPID_ESC_FREQUENCY;
} else {
bankMode = ActuatorSettings::BANKMODE_PWMSYNC;
bankMode = ActuatorSettings::BANKMODE_PWMSYNC;
escFrequence = PWMSYNC_ESC_FREQUENCY;
}
break;
case VehicleConfigurationSource::ESC_ONESHOT:
escFrequence = RAPID_ESC_FREQUENCY;
bankMode = ActuatorSettings::BANKMODE_ONESHOT125;
escFrequence = ONESHOT_ESC_FREQUENCY;
break;
default:
break;

2
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.h
View File

@ -59,6 +59,8 @@ public:
bool setupHardwareSettings(bool save = true);
static const qint16 LEGACY_ESC_FREQUENCY = 50;
static const qint16 RAPID_ESC_FREQUENCY = 490;
static const qint16 PWMSYNC_ESC_FREQUENCY = 0;
static const qint16 ONESHOT_ESC_FREQUENCY = 0;
static const qint16 ANALOG_SERVO_FREQUENCY = 50;
static const qint16 DIGITAL_SERVO_FREQUENCY = 333;
static const int MIXER_TYPE_NONE = 0;

13
ground/openpilotgcs/src/plugins/systemhealth/html/BootFault-RebootRequired.html Normal file
View File

@ -0,0 +1,13 @@
<html>
<head>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<h1>System Alarm</h1>
<p>
Reboot is required !!!
</p>
</body>
</html>

18
ground/openpilotgcs/src/plugins/systemhealth/html/SystemConfiguration-FlightMode.html Normal file
View File

@ -0,0 +1,18 @@
<html>
<head>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<h1>System Configuration : FlightMode</h1>
<p>
There is a problem with flightmode configuration :
<ul>
<li>One Gps assisted mode is present and you are using a CC/CC3D.</li>
<li>One Gps assisted mode is present and you don't use "GPS Navigation (INS13)" and GPS configured.</li>
<li>One stabilised mode use a wrong thrust mode, like CruizeControl with Rate on Pitch/Roll.</li>
</ul>
</p>
</body>
</html>

17
ground/openpilotgcs/src/plugins/systemhealth/html/SystemConfiguration-UnsupportedConfig_OneShot.html Normal file
View File

@ -0,0 +1,17 @@
<html>
<head>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<h1>System Configuration : Unsupported Config OneShot</h1>
<p>
You have selected an unsupported config for PWMSync or OneShot :
<ul>
<li>Double check if RC Input used is compatible with this mode,</li>
<li>Double check your Output configuration.</li>
</ul>
</p>
</body>
</html>

13
ground/openpilotgcs/src/plugins/systemhealth/html/fr/BootFault-RebootRequired.html Normal file
View File

@ -0,0 +1,13 @@
<html>
<head>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<h1>Alarme Système</h1>
<p>
Un redémarrage est nécessaire !!!
</p>
</body>
</html>

2
ground/openpilotgcs/src/plugins/systemhealth/html/fr/SystemConfiguration-Critical.html
View File

@ -10,7 +10,7 @@
Une des conditions suivantes semble présente :
<ul>
<li>
<p>Vous avez réglé un mode GPS (PosHold, RTB) l'interrupteur de mode de vol, et vous avez sélectionné "Basic (Complementary)" comme algorithme d'estimation de l'attitude.</p>
<p>Vous avez réglé un mode GPS (PosHold, RTB) sur un mode de vol, et vous avez sélectionné "Basic (Complementary)" comme algorithme d'estimation de l'attitude.</p>
<p>Sélectionnez "GPS Navigation (INS13)" dans l'onglet Config -> Attitude -> Paramètres -> Algorithme d'Estimation de l'Attitude.</p>
</li>
</ul>

18
ground/openpilotgcs/src/plugins/systemhealth/html/fr/SystemConfiguration-FlightMode.html Normal file
View File

@ -0,0 +1,18 @@
<html>
<head>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<h1>Configuration Système : FlightMode</h1>
<p>
Il y a un problème avec la configuration des modes de vol :
<ul>
<li>Un mode assisté GPS est présent et vous utilisez une carte CC/CC3D.</li>
<li>Un mode assisté GPS est présent mais vous n'avez pas choisi "GPS Navigation (INS13)" et configuré un GPS.</li>
<li>Un mode de stabilisation utilise un mode de poussée incompatible, comme CruizeControl avec Rate en Pitch/Roll.</li>
</ul>
</p>
</body>
</html>

17
ground/openpilotgcs/src/plugins/systemhealth/html/fr/SystemConfiguration-UnsupportedConfig_OneShot.html Normal file
View File

@ -0,0 +1,17 @@
<html>
<head>
<title></title>
<meta content="">
<style></style>
</head>
<body>
<h1>Configuration Système: Mauvaise Config OneShot</h1>
<p>
Vous avez sélectionné une configuration incompatible avec PWMSync ou OneShot :
<ul>
<li>Vérifiez si votre configuration d'entrée Rc est compatible avec ces modes,</li>
<li>Vérifiez votre configuration des sorties.</li>
</ul>
</p>
</body>
</html>

6
ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc
View File

@ -31,6 +31,9 @@
<file>html/Magnetometer-Critical.html</file>
<file>html/Magnetometer-Warning.html</file>
<file>html/Stabilization-Critical.html</file>
<file>html/SystemConfiguration-UnsupportedConfig_OneShot.html</file>
<file>html/SystemConfiguration-FlightMode.html</file>
<file>html/BootFault-RebootRequired.html</file>
</qresource>
<qresource prefix="/systemhealth" lang="fr">
<file alias="html/Actuator-Critical.html">html/fr/Actuator-Critical.html</file>
@ -64,6 +67,9 @@
<file alias="html/Magnetometer-Warning.html">html/fr/Magnetometer-Warning.html</file>
<file alias="html/Magnetometer-Critical.html">html/fr/Magnetometer-Critical.html</file>
<file alias="html/Stabilization-Critical.html">html/fr/Stabilization-Critical.html</file>
<file alias="html/SystemConfiguration-UnsupportedConfig_OneShot.html">html/fr/SystemConfiguration-UnsupportedConfig_OneShot.html</file>
<file alias="html/SystemConfiguration-FlightMode.html">html/fr/SystemConfiguration-FlightMode.html</file>
<file alias="html/BootFault-RebootRequired.html">html/fr/BootFault-RebootRequired.html</file>
</qresource>
</RCC>