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

Merge remote-tracking branch 'origin/amorale/OP-1196_attitude_tab_not_populated_for_cc' into next

Browse Source
This commit is contained in:
Alessio Morale 2014-04-26 23:04:18 +02:00
commit c6dfa25897
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/openpilotgcs/src/plugins/config/config_cc_hw_widget.cpp
View File

@ -26,7 +26,6 @@
*/ */
#include "config_cc_hw_widget.h" #include "config_cc_hw_widget.h"
#include "hwsettings.h" #include "hwsettings.h"
#include <QDebug> #include <QDebug>
#include <QStringList> #include <QStringList>
#include <QWidget> #include <QWidget>
@ -83,7 +82,16 @@ ConfigCCHWWidget::ConfigCCHWWidget(QWidget *parent) : ConfigTaskWidget(parent)
addWidgetBinding("HwSettings", "TelemetrySpeed", m_telemetry->telemetrySpeed); addWidgetBinding("HwSettings", "TelemetrySpeed", m_telemetry->telemetrySpeed);
addWidgetBinding("HwSettings", "GPSSpeed", m_telemetry->gpsSpeed); addWidgetBinding("HwSettings", "GPSSpeed", m_telemetry->gpsSpeed);
// Add Gps protocol configuration // Add Gps protocol configuration
addWidgetBinding("GPSSettings", "DataProtocol", m_telemetry->gpsProtocol);
HwSettings *hwSettings = HwSettings::GetInstance(getObjectManager());
HwSettings::DataFields hwSettingsData = hwSettings->getData();
if(hwSettingsData.OptionalModules[HwSettings::OPTIONALMODULES_GPS] != HwSettings::OPTIONALMODULES_ENABLED) {
m_telemetry->gpsProtocol->setEnabled(false);
m_telemetry->gpsProtocol->setToolTip(tr("Enable GPS module and reboot the board to be able to select GPS protocol"));
} else {
addWidgetBinding("GPSSettings", "DataProtocol", m_telemetry->gpsProtocol);
}
addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_telemetry->comUsbBridgeSpeed); addWidgetBinding("HwSettings", "ComUsbBridgeSpeed", m_telemetry->comUsbBridgeSpeed);
connect(m_telemetry->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp())); connect(m_telemetry->cchwHelp, SIGNAL(clicked()), this, SLOT(openHelp()));

3
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
View File

@ -44,7 +44,6 @@ ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) :
ui(new Ui_ccattitude) ui(new Ui_ccattitude)
{ {
ui->setupUi(this); ui->setupUi(this);
forceConnectedState(); // dynamic widgets don't recieve the connected signal
connect(ui->zeroBias, SIGNAL(clicked()), this, SLOT(startAccelCalibration())); connect(ui->zeroBias, SIGNAL(clicked()), this, SLOT(startAccelCalibration()));
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance(); ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
@ -67,7 +66,9 @@ ConfigCCAttitudeWidget::ConfigCCAttitudeWidget(QWidget *parent) :
addWidgetBinding("AttitudeSettings", "BoardRotation", ui->pitchBias, AttitudeSettings::BOARDROTATION_PITCH); addWidgetBinding("AttitudeSettings", "BoardRotation", ui->pitchBias, AttitudeSettings::BOARDROTATION_PITCH);
addWidgetBinding("AttitudeSettings", "BoardRotation", ui->yawBias, AttitudeSettings::BOARDROTATION_YAW); addWidgetBinding("AttitudeSettings", "BoardRotation", ui->yawBias, AttitudeSettings::BOARDROTATION_YAW);
addWidget(ui->zeroBias); addWidget(ui->zeroBias);
populateWidgets();
refreshWidgetsValues(); refreshWidgetsValues();
forceConnectedState();
} }
ConfigCCAttitudeWidget::~ConfigCCAttitudeWidget() ConfigCCAttitudeWidget::~ConfigCCAttitudeWidget()