rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-21 11:54:15 +01:00
Code Issues Releases Activity

LP-551 Add extra safety while testing outputs - Prevent input calibration start

Browse Source
This commit is contained in:
Laurent Lalanne 2018-01-15 14:54:12 +01:00
parent 42332c6913
commit e5c574b20e
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ground/gcs/src/plugins/config/configoutputwidget.cpp
View File

@ -190,6 +190,13 @@ void ConfigOutputWidget::sendAllChannelTests()
*/ */
void ConfigOutputWidget::runChannelTests(bool state) void ConfigOutputWidget::runChannelTests(bool state)
{ {
if (!checkOutputConfig()) {
m_ui->channelOutTest->setChecked(false);
QMessageBox::warning(this, tr("Warning"), tr("There is something wrong in current config."
"<p>Please fix the issue before starting testing outputs.</p>"), QMessageBox::Ok);
return;
}
SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager()); SystemAlarms *systemAlarmsObj = SystemAlarms::GetInstance(getObjectManager());
SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData(); SystemAlarms::DataFields systemAlarms = systemAlarmsObj->getData();
@ -224,6 +231,13 @@ void ConfigOutputWidget::runChannelTests(bool state)
channelTestsStarted = state; channelTestsStarted = state;
// Emit signal to be received by Input tab
emit outputConfigSafe(!state);
m_ui->spinningArmed->setEnabled(!state);
m_ui->alwaysStabilizedSwitch->setEnabled((m_ui->spinningArmed->isChecked()) && !state);
m_ui->alwayStabilizedLabel1->setEnabled((m_ui->spinningArmed->isChecked()) && !state);
m_ui->alwayStabilizedLabel2->setEnabled((m_ui->spinningArmed->isChecked()) && !state);
enableBanks(!state); enableBanks(!state);
ActuatorCommand *obj = ActuatorCommand::GetInstance(getObjectManager()); ActuatorCommand *obj = ActuatorCommand::GetInstance(getObjectManager());
@ -678,7 +692,7 @@ void ConfigOutputWidget::onBankTypeChange()
updateChannelConfigWarning(warning_found); updateChannelConfigWarning(warning_found);
} }
void ConfigOutputWidget::checkOutputConfig() bool ConfigOutputWidget::checkOutputConfig()
{ {
ChannelConfigWarning current_warning = None; ChannelConfigWarning current_warning = None;
ChannelConfigWarning warning_found = None; ChannelConfigWarning warning_found = None;
@ -704,6 +718,8 @@ void ConfigOutputWidget::checkOutputConfig()
// Emit signal to be received by Input tab // Emit signal to be received by Input tab
emit outputConfigSafe(warning_found == None); emit outputConfigSafe(warning_found == None);
return warning_found == None;
} }
void ConfigOutputWidget::stopTests() void ConfigOutputWidget::stopTests()

2
ground/gcs/src/plugins/config/configoutputwidget.h
View File

@ -119,7 +119,7 @@ private:
enum ChannelConfigWarning { None, CannotDriveServo, IsNormalMotorCheckNeutral, IsReversibleMotorCheckNeutral, BiDirectionalDShotNotSupported }; enum ChannelConfigWarning { None, CannotDriveServo, IsNormalMotorCheckNeutral, IsReversibleMotorCheckNeutral, BiDirectionalDShotNotSupported };
void setChannelLimits(OutputChannelForm *channelForm, OutputBankControls *bankControls); void setChannelLimits(OutputChannelForm *channelForm, OutputBankControls *bankControls);
ChannelConfigWarning checkChannelConfig(OutputChannelForm *channelForm, OutputBankControls *bankControls); ChannelConfigWarning checkChannelConfig(OutputChannelForm *channelForm, OutputBankControls *bankControls);
void checkOutputConfig(); bool checkOutputConfig();
void updateChannelConfigWarning(ChannelConfigWarning warning); void updateChannelConfigWarning(ChannelConfigWarning warning);
private slots: private slots: