rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-15 07:29:15 +01:00
Code Issues Releases Activity

OP-1222 Fixed a bug with Actuator settings and banks to use for motors.

Browse Source
This commit is contained in:
m_thread 2014-08-18 13:14:07 +02:00
parent 5354723928
commit 82a3590da5
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/plugins/coreplugin/core.qrc
View File

@ -63,5 +63,6 @@
<file>qml/images/tab.png</file>
<file>qml/AboutDialog.qml</file>
<file alias="qml/AuthorsModel.qml">../../../../../build/openpilotgcs-synthetics/AuthorsModel.qml</file>
<file>images/opie_90x120.gif</file>
</qresource>
</RCC>

BIN
ground/openpilotgcs/src/plugins/coreplugin/images/opie_90x120.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 350 KiB

21
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
View File

@ -57,6 +57,17 @@ Rectangle {
}
}
}
AnimatedImage {
id: opie
anchors.left: parent.left
anchors.leftMargin: 10
anchors.top: logo.bottom
anchors.topMargin: 10
source: "../images/opie_90x120.gif"
z: 100
fillMode: Image.PreserveAspectFit
visible: false
}
Rectangle {
anchors.left: logo.right
@ -76,7 +87,15 @@ Rectangle {
Layout.fillWidth: true
font.pixelSize: 14
font.bold: true
MouseArea {
id: easter_egg
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onClicked: {
opie.visible = !opie.visible
}
}
}
Text {
id: versionLabel

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

@ -348,6 +348,7 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
}
for (quint16 i = 0; i < ActuatorSettings::CHANNELUPDATEFREQ_NUMELEM; i++) {
data.ChannelUpdateFreq[i] = updateFrequence;
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_REVO) {
if (i == 1) {
data.ChannelUpdateFreq[i] = ANALOG_SERVO_FREQUENCE;
@ -357,7 +358,6 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
data.ChannelUpdateFreq[i] = ANALOG_SERVO_FREQUENCE;
}
}
data.ChannelUpdateFreq[i] = updateFrequence;
}
actSettings->setData(data);