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-514 Changes from review - Simplify and rename.

Browse Source
This commit is contained in:
Laurent Lalanne 2018-02-14 13:53:09 +01:00
parent 498aba5c19
commit 76118a2984
2 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ground/gcs/src/plugins/setupwizard/pages/outputcalibrationpage.cpp
View File

@ -91,7 +91,7 @@ void OutputCalibrationPage::setupActuatorMinMaxAndNeutral(int motorChannelStart,
|| (getWizard()->getVehicleSubType() == SetupWizard::GROUNDVEHICLE_DIFFERENTIAL) || (getWizard()->getVehicleSubType() == SetupWizard::GROUNDVEHICLE_DIFFERENTIAL)
|| (getWizard()->getVehicleSubType() == SetupWizard::GROUNDVEHICLE_BOAT) || (getWizard()->getVehicleSubType() == SetupWizard::GROUNDVEHICLE_BOAT)
|| (getWizard()->getVehicleSubType() == SetupWizard::GROUNDVEHICLE_DIFFERENTIAL_BOAT)) { || (getWizard()->getVehicleSubType() == SetupWizard::GROUNDVEHICLE_DIFFERENTIAL_BOAT)) {
m_actuatorSettings[servoid].channelNeutral = NEUTRAL_OUTPUT_RATE_MILLISECONDS; m_actuatorSettings[servoid].channelNeutral = NEUTRAL_OUTPUT_RATE_MS;
m_actuatorSettings[servoid].isReversableMotor = true; m_actuatorSettings[servoid].isReversableMotor = true;
} }
// Set initial output value // Set initial output value
@ -99,17 +99,17 @@ void OutputCalibrationPage::setupActuatorMinMaxAndNeutral(int motorChannelStart,
m_calibrationUtil->stopChannelOutput(); m_calibrationUtil->stopChannelOutput();
} else if (servoid < totalUsedChannels) { } else if (servoid < totalUsedChannels) {
// Set to servo safe values // Set to servo safe values
m_actuatorSettings[servoid].channelMin = NEUTRAL_OUTPUT_RATE_MILLISECONDS; m_actuatorSettings[servoid].channelMin = NEUTRAL_OUTPUT_RATE_MS;
m_actuatorSettings[servoid].channelNeutral = NEUTRAL_OUTPUT_RATE_MILLISECONDS; m_actuatorSettings[servoid].channelNeutral = NEUTRAL_OUTPUT_RATE_MS;
m_actuatorSettings[servoid].channelMax = NEUTRAL_OUTPUT_RATE_MILLISECONDS; m_actuatorSettings[servoid].channelMax = NEUTRAL_OUTPUT_RATE_MS;
// Set initial servo output value // Set initial servo output value
m_calibrationUtil->startChannelOutput(servoid, NEUTRAL_OUTPUT_RATE_MILLISECONDS); m_calibrationUtil->startChannelOutput(servoid, NEUTRAL_OUTPUT_RATE_MS);
m_calibrationUtil->stopChannelOutput(); m_calibrationUtil->stopChannelOutput();
} else { } else {
// "Disable" these channels // "Disable" these channels
m_actuatorSettings[servoid].channelMin = LOW_OUTPUT_RATE_MILLISECONDS; m_actuatorSettings[servoid].channelMin = LOW_OUTPUT_RATE_MS;
m_actuatorSettings[servoid].channelNeutral = LOW_OUTPUT_RATE_MILLISECONDS; m_actuatorSettings[servoid].channelNeutral = LOW_OUTPUT_RATE_MS;
m_actuatorSettings[servoid].channelMax = LOW_OUTPUT_RATE_MILLISECONDS; m_actuatorSettings[servoid].channelMax = LOW_OUTPUT_RATE_MS;
} }
} }
} }
@ -472,9 +472,9 @@ void OutputCalibrationPage::setWizardPage()
ui->motorNeutralSlider->setMaximum(m_actuatorSettings[currentChannel].channelMin + NEUTRAL_OUTPUT_RATE_RANGE); ui->motorNeutralSlider->setMaximum(m_actuatorSettings[currentChannel].channelMin + NEUTRAL_OUTPUT_RATE_RANGE);
if (ui->motorNeutralSlider->minimum() == LOW_OUTPUT_RATE_DSHOT) { if (ui->motorNeutralSlider->minimum() == LOW_OUTPUT_RATE_DSHOT) {
// DShot output // DShot output
ui->motorPWMValue->setText(QString(tr("Digital output value : <b>%1</b>")).arg(m_actuatorSettings[currentChannel].channelNeutral)); ui->motorPWMValue->setText(tr("Digital output value : <b>%1</b>").arg(m_actuatorSettings[currentChannel].channelNeutral));
} else { } else {
ui->motorPWMValue->setText(QString(tr("Output value : <b>%1</b> µs")).arg(m_actuatorSettings[currentChannel].channelNeutral)); ui->motorPWMValue->setText(tr("Output value : <b>%1</b> µs").arg(m_actuatorSettings[currentChannel].channelNeutral));
} }
// Reversable motor found // Reversable motor found
if (m_actuatorSettings[currentChannel].isReversableMotor) { if (m_actuatorSettings[currentChannel].isReversableMotor) {
@ -788,10 +788,10 @@ bool OutputCalibrationPage::checkAlarms()
if (data.Alarm[SystemAlarms::ALARM_ACTUATOR] != SystemAlarms::ALARM_OK) { if (data.Alarm[SystemAlarms::ALARM_ACTUATOR] != SystemAlarms::ALARM_OK) {
QMessageBox mbox(this); QMessageBox mbox(this);
mbox.setText(QString(tr("The actuator module is in an error state.\n\n" mbox.setText(tr("The actuator module is in an error state.\n\n"
"Please make sure the correct firmware version is used then " "Please make sure the correct firmware version is used then "
"restart the wizard and try again. If the problem persists please " "restart the wizard and try again. If the problem persists please "
"consult the librepilot.org support forum."))); "consult the librepilot.org support forum."));
mbox.setStandardButtons(QMessageBox::Ok); mbox.setStandardButtons(QMessageBox::Ok);
mbox.setIcon(QMessageBox::Critical); mbox.setIcon(QMessageBox::Critical);
@ -829,9 +829,8 @@ int OutputCalibrationPage::getLowOutputRate()
getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT600 || getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT600 ||
getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT1200) { getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT1200) {
return LOW_OUTPUT_RATE_DSHOT; return LOW_OUTPUT_RATE_DSHOT;
} else {
return LOW_OUTPUT_RATE_MILLISECONDS_PWM;
} }
return LOW_OUTPUT_RATE_PWM_MS;
} }
int OutputCalibrationPage::getHighOutputRate() int OutputCalibrationPage::getHighOutputRate()
@ -839,14 +838,13 @@ int OutputCalibrationPage::getHighOutputRate()
if (getWizard()->getEscType() == VehicleConfigurationSource::ESC_ONESHOT125 || if (getWizard()->getEscType() == VehicleConfigurationSource::ESC_ONESHOT125 ||
getWizard()->getEscType() == VehicleConfigurationSource::ESC_ONESHOT42 || getWizard()->getEscType() == VehicleConfigurationSource::ESC_ONESHOT42 ||
getWizard()->getEscType() == VehicleConfigurationSource::ESC_MULTISHOT) { getWizard()->getEscType() == VehicleConfigurationSource::ESC_MULTISHOT) {
return HIGH_OUTPUT_RATE_MILLISECONDS_ONESHOT_MULTISHOT; return HIGH_OUTPUT_RATE_ONESHOT_MULTISHOT_MS;
} else if (getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT150 || } else if (getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT150 ||
getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT600 || getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT600 ||
getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT1200) { getWizard()->getEscType() == VehicleConfigurationSource::ESC_DSHOT1200) {
return HIGH_OUTPUT_RATE_DSHOT; return HIGH_OUTPUT_RATE_DSHOT;
} else {
return HIGH_OUTPUT_RATE_MILLISECONDS_PWM;
} }
return HIGH_OUTPUT_RATE_PWM_MS;
} }
void OutputCalibrationPage::on_motorNeutralSlider_valueChanged(int value) void OutputCalibrationPage::on_motorNeutralSlider_valueChanged(int value)
@ -855,9 +853,9 @@ void OutputCalibrationPage::on_motorNeutralSlider_valueChanged(int value)
if (ui->motorNeutralSlider->minimum() == LOW_OUTPUT_RATE_DSHOT) { if (ui->motorNeutralSlider->minimum() == LOW_OUTPUT_RATE_DSHOT) {
// DShot output // DShot output
ui->motorPWMValue->setText(QString(tr("Digital output value : <b>%1</b>")).arg(value)); ui->motorPWMValue->setText(tr("Digital output value : <b>%1</b>").arg(value));
} else { } else {
ui->motorPWMValue->setText(QString(tr("Output value : <b>%1</b> µs")).arg(value)); ui->motorPWMValue->setText(tr("Output value : <b>%1</b> µs").arg(value));
} }
if (ui->motorNeutralButton->isChecked()) { if (ui->motorNeutralButton->isChecked()) {
quint16 value = ui->motorNeutralSlider->value(); quint16 value = ui->motorNeutralSlider->value();

14
ground/gcs/src/plugins/setupwizard/pages/outputcalibrationpage.h
View File

@ -87,14 +87,14 @@ private slots:
private: private:
enum ElementType { FULL, FRAME, MOTOR, SERVO }; enum ElementType { FULL, FRAME, MOTOR, SERVO };
static const int LOW_OUTPUT_RATE_DSHOT = 0; static const int LOW_OUTPUT_RATE_DSHOT = 0;
static const int HIGH_OUTPUT_RATE_DSHOT = 2000; static const int HIGH_OUTPUT_RATE_DSHOT = 2000;
static const int LOW_OUTPUT_RATE_MILLISECONDS = 1000; static const int LOW_OUTPUT_RATE_MS = 1000;
static const int LOW_OUTPUT_RATE_MILLISECONDS_PWM = 1000; static const int LOW_OUTPUT_RATE_PWM_MS = 1000;
static const int HIGH_OUTPUT_RATE_MILLISECONDS_PWM = 1900; static const int HIGH_OUTPUT_RATE_PWM_MS = 1900;
static const int NEUTRAL_OUTPUT_RATE_RANGE = 500; static const int NEUTRAL_OUTPUT_RATE_RANGE = 500;
static const int NEUTRAL_OUTPUT_RATE_MILLISECONDS = 1500; static const int NEUTRAL_OUTPUT_RATE_MS = 1500;
static const int HIGH_OUTPUT_RATE_MILLISECONDS_ONESHOT_MULTISHOT = 2000; static const int HIGH_OUTPUT_RATE_ONESHOT_MULTISHOT_MS = 2000;
void setupVehicle(); void setupVehicle();
void startWizard(); void startWizard();