rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

Merge branch 'thread/15.02-RC1_fixes' into rel-15.02

Browse Source
This commit is contained in:
m_thread 2015-02-28 14:58:01 +01:00
commit b795e56b1a
8 changed files with 113 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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) // Clear advanced settings table if not Custom selected (Keep previous settings)
if (TypeText.compare(QString::fromUtf8("Custom - Advanced Settings"), Qt::CaseInsensitive) != 0) { 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); 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 if (TypeInt != 0) { // not advanced settings
// get the channel data from the ui // get the channel data from the ui
MixerChannelData[0] = m_aircraft->ccpmEngineChannel->currentIndex(); MixerChannelData[0] = m_aircraft->ccpmEngineChannel->currentIndex();
@ -796,7 +796,7 @@ void ConfigCcpmWidget::UpdateMixer()
Channel = QString((int)ConfigCcpmWidget::CHANNEL_NUMELEM + 1); Channel = QString((int)ConfigCcpmWidget::CHANNEL_NUMELEM + 1);
} }
MixerChannelData[i] = Channel.toInt(); 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_CC:
case VehicleConfigurationSource::CONTROLLER_CC3D: case VehicleConfigurationSource::CONTROLLER_CC3D:
prefix = "cc-"; prefix = "cc-";
if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT) { if (m_configSource->getEscType() == VehicleConfigurationSource::ESC_ONESHOT ||
m_configSource->getEscType() == VehicleConfigurationSource::ESC_RAPID) {
suffix = "-oneshot"; suffix = "-oneshot";
} }
break; 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(); QDir templateDir(templateBasePath);
foreach(QJsonObject * templ, m_templates.values()) {
delete templ;
}
m_templates.clear();
QDir templateDir(QString("%1/%2/").arg(Utils::PathUtils().InsertDataPath("%%DATAPATH%%cloudconfig")).arg(m_dir)); qDebug() << "Loading templates from base path:" << templateBasePath;
QStringList names; QStringList names;
names << "*.optmpl"; names << "*.optmpl";
templateDir.setNameFilters(names); 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() void AirframeInitialTuningPage::setupTemplateList()
{ {
QListWidgetItem *item; QListWidgetItem *item;

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

@ -44,7 +44,6 @@ public:
void initializePage(); void initializePage();
bool validatePage(); bool validatePage();
bool isComplete() const; bool isComplete() const;
public slots: public slots:
void templateSelectionChanged(); void templateSelectionChanged();
@ -59,6 +58,7 @@ private:
QGraphicsPixmapItem *m_photoItem; QGraphicsPixmapItem *m_photoItem;
void loadValidFiles(); void loadValidFiles();
void loadFilesInDir(QString templateBasePath);
void setupTemplateList(); void setupTemplateList();
QString getTemplateKey(QJsonObject *templ); QString getTemplateKey(QJsonObject *templ);
void updatePhoto(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); enableButtons(true);
emit completeChanged(); emit completeChanged();
if (m_successfulWrite) {
getWizard()->next();
}
} }
void SavePage::enableButtons(bool enable) 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" inkscape:window-height="928"
id="namedview4616" id="namedview4616"
showgrid="false" showgrid="false"
inkscape:zoom="1.9844144" inkscape:zoom="0.70159644"
inkscape:cx="236.10597" inkscape:cx="305.10274"
inkscape:cy="505.93946" inkscape:cy="632.28327"
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="layer12" inkscape:current-layer="layer17"
fit-margin-top="15" fit-margin-top="15"
fit-margin-left="15" fit-margin-left="15"
fit-margin-right="15" fit-margin-right="15"
@ -18146,7 +18146,7 @@
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
style="display:inline" style="display:inline"
id="sbus" id="revo-sbus"
transform="matrix(0.4,0,0,0.4,53.475,-98.70912)"> transform="matrix(0.4,0,0,0.4,53.475,-98.70912)">
<path <path
id="path9857-8-5-2" id="path9857-8-5-2"
@ -18221,47 +18221,46 @@
</g> </g>
</g> </g>
<g <g
sodipodi:insensitive="true"
style="display:none" style="display:none"
inkscape:label="revo-satellite" inkscape:label="revo-satellite"
id="g11310" id="g11310"
inkscape:groupmode="layer"> inkscape:groupmode="layer">
<g <g
transform="matrix(0.4,0,0,0.4,-131.04473,-97.93132)" transform="matrix(0.4,0,0,0.4,-131.04473,-97.93132)"
id="g11312"> id="revo-satellite">
<path <path
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" 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" inkscape:connector-curvature="0"
stroke-miterlimit="4" 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" /> id="path11315" />
<path <path
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" 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" inkscape:connector-curvature="0"
stroke-miterlimit="4" 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" /> id="path11317" />
<path <path
id="path11319" 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" 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" style="fill:none;stroke:#1f4697;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<path <path
id="path11321" 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" 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" style="fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<path <path
id="path11323" 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" 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" style="fill:none;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
<path <path
id="path11325" 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" 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" style="fill:none;stroke:#000000;stroke-width:15.30000019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:nodetypes="cccc" /> sodipodi:nodetypes="cccc" />
@ -18861,7 +18860,7 @@
inkscape:groupmode="layer"> inkscape:groupmode="layer">
<g <g
transform="matrix(0.4,0,0,0.4,53.475,-98.70912)" transform="matrix(0.4,0,0,0.4,53.475,-98.70912)"
id="g11325" id="cc-sbus"
style="display:inline"> style="display:inline">
<path <path
style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" 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" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
id="satellite" id="cc-satellite"
transform="matrix(0.4,0,0,0.4,-131.04473,-97.93132)"> transform="matrix(0.4,0,0,0.4,-131.04473,-97.93132)">
<path <path
id="path9857-8" 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" stroke-miterlimit="4"
inkscape:connector-curvature="0" 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" /> style="fill:none;stroke:#777777;stroke-width:14.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
<path <path
id="path9857-8-5" 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" stroke-miterlimit="4"
inkscape:connector-curvature="0" 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" /> 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" sodipodi:nodetypes="cccc"
style="fill:none;stroke:#1f4697;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" 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" 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" /> id="path8856-5-6" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="fill:none;stroke:#d81900;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" 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" 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" /> id="path8856-1-2" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="fill:none;stroke:#ec6004;stroke-width:15.29999924;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" 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" 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" /> id="path8856-5-1-7-1-9" />
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="fill:none;stroke:#000000;stroke-width:15.30000019;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" 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" 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" /> id="path8856-1-5-7" />
<rect <rect
rx="11.5" rx="11.5"
@ -19544,11 +19543,11 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer23" id="layer23"
inkscape:label="generic-nmea" inkscape:label="revo-generic-nmea"
style="display:none" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
id="generic-nmea"> id="revo-generic-nmea">
<g <g
id="g14377" id="g14377"
transform="matrix(0,0.77129601,-0.77129601,0,1404.0461,377.01359)"> transform="matrix(0,0.77129601,-0.77129601,0,1404.0461,377.01359)">
@ -20431,11 +20430,11 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer28" id="layer28"
inkscape:label="OPGPS-v8-ublox" inkscape:label="revo-OPGPS-v8-ublox"
style="display:none" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
id="OPGPS-v8-ublox"> id="revo-OPGPS-v8-ublox">
<path <path
sodipodi:nodetypes="ccccc" sodipodi:nodetypes="ccccc"
style="fill:none;stroke:#1f4697;stroke-width:6.11999989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" 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> </g>
<path <path
transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,553.33859)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -20594,7 +20593,7 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,0.40146247,-0.40146247,0,819.07458,553.33859)" />
<path <path
sodipodi:type="arc" sodipodi:type="arc"
@ -20604,11 +20603,11 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,750.0552)" />
<path <path
transform="matrix(0,0.40146247,-0.40146247,0,819.07458,750.0552)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -20732,11 +20731,11 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer36" id="layer36"
inkscape:label="OPGPS-v9" inkscape:label="revo-OPGPS-v9"
style="display:none" style="display:inline"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
id="OPGPS-v9"> id="revo-OPGPS-v9">
<rect <rect
id="rect14138-8-9-5" id="rect14138-8-9-5"
x="620.07581" x="620.07581"
@ -20757,11 +20756,11 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,-0.40146247,0.40146247,0,260.05873,720.82148)" />
<path <path
transform="matrix(0,-0.40146247,0.40146247,0,260.05873,524.10489)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -20885,7 +20884,7 @@
</g> </g>
<path <path
transform="matrix(0,-0.40146247,0.40146247,0,456.77534,720.82148)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -20901,7 +20900,7 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,-0.40146247,0.40146247,0,456.77534,524.10489)" />
<rect <rect
id="rect7428" id="rect7428"
@ -22804,13 +22803,13 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer5" id="layer5"
inkscape:label="flexi-generic-nmea" inkscape:label="flexi-revo-generic-nmea"
style="display:inline" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
transform="translate(-248,4.5990295e-6)" transform="translate(-248,4.5990295e-6)"
style="display:inline" style="display:inline"
id="flexi-generic-nmea"> id="flexi-revo-generic-nmea">
<g <g
id="g14377-12" id="g14377-12"
transform="matrix(0,0.77129601,-0.77129601,0,1404.0461,377.01359)"> transform="matrix(0,0.77129601,-0.77129601,0,1404.0461,377.01359)">
@ -23699,7 +23698,7 @@
<g <g
transform="translate(-340,4.6e-6)" transform="translate(-340,4.6e-6)"
style="display:inline" style="display:inline"
id="flexi-OPGPS-v8-ublox"> id="flexi-revo-OPGPS-v8-ublox">
<path <path
sodipodi:nodetypes="cccc" sodipodi:nodetypes="cccc"
style="fill:none;stroke:#000000;stroke-width:6.11999989;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none" 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> </g>
<path <path
transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,553.33859)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -23858,7 +23857,7 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,0.40146247,-0.40146247,0,819.07458,553.33859)" />
<path <path
sodipodi:type="arc" sodipodi:type="arc"
@ -23868,11 +23867,11 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,0.40146247,-0.40146247,0,1015.7912,750.0552)" />
<path <path
transform="matrix(0,0.40146247,-0.40146247,0,819.07458,750.0552)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -23996,13 +23995,13 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer9" id="layer9"
inkscape:label="flexi-OPGPS-v9" inkscape:label="flexi-revo-OPGPS-v9"
style="display:none" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
transform="translate(-240,4.5990295e-6)" transform="translate(-240,4.5990295e-6)"
style="display:inline" style="display:inline"
id="flexi-OPGPS-v9"> id="flexi-revo-OPGPS-v9">
<rect <rect
id="rect14138-8-9-5-5" id="rect14138-8-9-5-5"
x="620.07581" x="620.07581"
@ -24023,11 +24022,11 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,-0.40146247,0.40146247,0,260.05873,720.82148)" />
<path <path
transform="matrix(0,-0.40146247,0.40146247,0,260.05873,524.10489)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -24151,7 +24150,7 @@
</g> </g>
<path <path
transform="matrix(0,-0.40146247,0.40146247,0,456.77534,720.82148)" 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:ry="23.877298"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
@ -24167,7 +24166,7 @@
sodipodi:cy="572.3067" sodipodi:cy="572.3067"
sodipodi:rx="23.877298" sodipodi:rx="23.877298"
sodipodi:ry="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)" /> transform="matrix(0,-0.40146247,0.40146247,0,456.77534,524.10489)" />
<rect <rect
id="rect7428-5" id="rect7428-5"
@ -24357,9 +24356,9 @@
<polygon <polygon
transform="matrix(1.5711089,0,0,1.5372108,235.33403,522.2062)" transform="matrix(1.5711089,0,0,1.5372108,235.33403,522.2062)"
id="polygon8706-1-0" 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 <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" id="polygon10148-4"
transform="matrix(1.5711089,0,0,1.5372108,357.19879,522.2062)" /> transform="matrix(1.5711089,0,0,1.5372108,357.19879,522.2062)" />
<g <g
@ -26082,7 +26081,7 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer40" id="layer40"
inkscape:label="nano-ms4525" inkscape:label="nano-ms4525-speed-sensor"
style="display:none" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
@ -26575,7 +26574,7 @@
<polygon <polygon
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="polygon13-5" 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 <path
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="path15-2" id="path15-2"
@ -26589,7 +26588,7 @@
<polygon <polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19-3" 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 <path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21-6" id="path21-6"
@ -26598,7 +26597,7 @@
<polygon <polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23-6" 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 <path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25-2" id="path25-2"
@ -26615,7 +26614,7 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer41" id="layer41"
inkscape:label="nano-eagletree" inkscape:label="nano-eagletree-speed-sensor"
style="display:none" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <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" /> style="fill:#df181b;fill-opacity:1;stroke:#000000;stroke-width:0.77129602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path <path
transform="matrix(0.77129601,0,0,0.77129601,324.31484,-346.34006)" 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:ry="5.2069426"
sodipodi:rx="5.4548922" sodipodi:rx="5.4548922"
sodipodi:cy="501.66602" sodipodi:cy="501.66602"
@ -27589,7 +27588,7 @@
id="path8856-5-6-5-6-7-2-87-6-9" /> id="path8856-5-6-5-6-7-2-87-6-9" />
<path <path
transform="translate(-136.3084,-443.63428)" 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:ry="5.1442995"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:cy="483.271" sodipodi:cy="483.271"
@ -27605,11 +27604,11 @@
sodipodi:cy="483.271" sodipodi:cy="483.271"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:ry="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)" /> transform="translate(-136.3084,-463.68797)" />
<path <path
transform="translate(-136.3084,-481.68799)" 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:ry="5.1442995"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:cy="483.271" sodipodi:cy="483.271"
@ -27625,7 +27624,7 @@
sodipodi:cy="483.271" sodipodi:cy="483.271"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:ry="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)" /> transform="translate(-136.3084,-501.68802)" />
<g <g
id="g9542-2-1" id="g9542-2-1"
@ -27726,7 +27725,7 @@
<polygon <polygon
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="polygon13-5-7" 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 <path
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="path15-2-6" id="path15-2-6"
@ -27740,7 +27739,7 @@
<polygon <polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19-3-9" 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 <path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21-6-0" id="path21-6-0"
@ -27749,7 +27748,7 @@
<polygon <polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23-6-4" 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 <path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25-2-1" id="path25-2-1"
@ -27766,11 +27765,11 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer42" id="layer42"
inkscape:label="ms4525" inkscape:label="revo-ms4525-speed-sensor"
style="display:none" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
id="ms4525-speed-sensor"> id="revo-ms4525-speed-sensor">
<path <path
id="rect3287-1" 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" 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 <polygon
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="polygon13" 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 <path
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="path15" id="path15"
@ -28193,7 +28192,7 @@
<polygon <polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19" 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 <path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21" id="path21"
@ -28202,7 +28201,7 @@
<polygon <polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23" 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 <path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25" id="path25"
@ -28296,11 +28295,11 @@
<g <g
inkscape:groupmode="layer" inkscape:groupmode="layer"
id="layer43" id="layer43"
inkscape:label="eagletree" inkscape:label="revo-eagletree-speed-sensor"
style="display:none" style="display:none"
sodipodi:insensitive="true"> sodipodi:insensitive="true">
<g <g
id="eagletree-speed-sensor"> id="revo-eagletree-speed-sensor">
<g <g
transform="matrix(0.77129601,0,0,0.77129601,-4.0324,89.181843)" transform="matrix(0.77129601,0,0,0.77129601,-4.0324,89.181843)"
id="g6563-8"> 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" /> style="fill:#df181b;fill-opacity:1;stroke:#000000;stroke-width:0.77129602px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path <path
transform="matrix(0.77129601,0,0,0.77129601,-4.0324,147.80034)" 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:ry="5.2069426"
sodipodi:rx="5.4548922" sodipodi:rx="5.4548922"
sodipodi:cy="501.66602" sodipodi:cy="501.66602"
@ -29270,7 +29269,7 @@
id="path8856-5-6-5-6-7-2-87-6-9-8" /> id="path8856-5-6-5-6-7-2-87-6-9-8" />
<path <path
transform="translate(-465.89215,50.457722)" 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:ry="5.1442995"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:cy="483.271" sodipodi:cy="483.271"
@ -29286,11 +29285,11 @@
sodipodi:cy="483.271" sodipodi:cy="483.271"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:ry="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)" /> transform="translate(-465.89215,30.404033)" />
<path <path
transform="translate(-465.89215,12.404008)" 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:ry="5.1442995"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:cy="483.271" sodipodi:cy="483.271"
@ -29306,7 +29305,7 @@
sodipodi:cy="483.271" sodipodi:cy="483.271"
sodipodi:rx="5.1442995" sodipodi:rx="5.1442995"
sodipodi:ry="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)" /> transform="translate(-465.89215,-7.5960203)" />
<g <g
id="g9542-2-1-6" id="g9542-2-1-6"
@ -29407,7 +29406,7 @@
<polygon <polygon
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="polygon13-5-7-1" 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 <path
style="fill-rule:evenodd" style="fill-rule:evenodd"
id="path15-2-6-3" id="path15-2-6-3"
@ -29421,7 +29420,7 @@
<polygon <polygon
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon19-3-9-3" 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 <path
style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path21-6-0-1" id="path21-6-0-1"
@ -29430,7 +29429,7 @@
<polygon <polygon
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="polygon23-6-4-7" 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 <path
style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005" style="fill:#c8c9ca;fill-rule:evenodd;stroke:#000000;stroke-width:0.82230002;stroke-miterlimit:2.61310005"
id="path25-2-1-5" 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; data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PWMNOONESHOT;
break; break;
case VehicleConfigurationSource::INPUT_PPM: 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; data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PPM_PIN8ONESHOT;
} else { } else {
data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PPMNOONESHOT; data.CC_RcvrPort = HwSettings::CC_RCVRPORT_PPMNOONESHOT;
@ -376,18 +377,19 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
bankMode = ActuatorSettings::BANKMODE_PWM; bankMode = ActuatorSettings::BANKMODE_PWM;
break; break;
case VehicleConfigurationSource::ESC_RAPID: case VehicleConfigurationSource::ESC_RAPID:
escFrequence = RAPID_ESC_FREQUENCY;
if ((m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC || if ((m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC ||
m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC3D) && m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_CC3D) &&
m_configSource->getInputType() == VehicleConfigurationSource::INPUT_PWM) { m_configSource->getInputType() == VehicleConfigurationSource::INPUT_PWM) {
bankMode = ActuatorSettings::BANKMODE_PWM; bankMode = ActuatorSettings::BANKMODE_PWM;
escFrequence = RAPID_ESC_FREQUENCY;
} else { } else {
bankMode = ActuatorSettings::BANKMODE_PWMSYNC; bankMode = ActuatorSettings::BANKMODE_PWMSYNC;
escFrequence = PWMSYNC_ESC_FREQUENCY;
} }
break; break;
case VehicleConfigurationSource::ESC_ONESHOT: case VehicleConfigurationSource::ESC_ONESHOT:
escFrequence = RAPID_ESC_FREQUENCY;
bankMode = ActuatorSettings::BANKMODE_ONESHOT125; bankMode = ActuatorSettings::BANKMODE_ONESHOT125;
escFrequence = ONESHOT_ESC_FREQUENCY;
break; break;
default: default:
break; break;

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

@ -59,6 +59,8 @@ public:
bool setupHardwareSettings(bool save = true); bool setupHardwareSettings(bool save = true);
static const qint16 LEGACY_ESC_FREQUENCY = 50; static const qint16 LEGACY_ESC_FREQUENCY = 50;
static const qint16 RAPID_ESC_FREQUENCY = 490; 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 ANALOG_SERVO_FREQUENCY = 50;
static const qint16 DIGITAL_SERVO_FREQUENCY = 333; static const qint16 DIGITAL_SERVO_FREQUENCY = 333;
static const int MIXER_TYPE_NONE = 0; static const int MIXER_TYPE_NONE = 0;