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

Uncrustify

Browse Source
This commit is contained in:
Fredrik Larson 2014-09-05 17:22:59 +10:00
parent ce64aa2ca7
commit cefffefd7b
3 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/plugins/setupwizard/pages/gpspage.cpp
View File

@ -73,5 +73,4 @@ void GpsPage::setupSelection(Selection *selection)
"controller."), "controller."),
"generic-nmea", "generic-nmea",
SetupWizard::GPS_NMEA); SetupWizard::GPS_NMEA);
} }

62
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
View File

@ -138,10 +138,11 @@ int SetupWizard::nextId() const
case CONTROLLER_REVO: case CONTROLLER_REVO:
case CONTROLLER_NANO: case CONTROLLER_NANO:
return PAGE_GPS; return PAGE_GPS;
default: default:
return PAGE_SUMMARY; return PAGE_SUMMARY;
} }
} }
case PAGE_SERVO: case PAGE_SERVO:
{ {
@ -149,9 +150,10 @@ int SetupWizard::nextId() const
case CONTROLLER_REVO: case CONTROLLER_REVO:
case CONTROLLER_NANO: case CONTROLLER_NANO:
return PAGE_GPS; return PAGE_GPS;
default: default:
return PAGE_SUMMARY; return PAGE_SUMMARY;
} }
} }
case PAGE_BIAS_CALIBRATION: case PAGE_BIAS_CALIBRATION:
@ -169,9 +171,10 @@ int SetupWizard::nextId() const
switch (getVehicleType()) { switch (getVehicleType()) {
case VEHICLE_FIXEDWING: case VEHICLE_FIXEDWING:
return PAGE_AIRSPEED; return PAGE_AIRSPEED;
default: default:
return PAGE_SUMMARY; return PAGE_SUMMARY;
} }
case PAGE_AIRSPEED: case PAGE_AIRSPEED:
return PAGE_SUMMARY; return PAGE_SUMMARY;
@ -183,8 +186,9 @@ int SetupWizard::nextId() const
case CONTROLLER_CC3D: case CONTROLLER_CC3D:
case CONTROLLER_REVO: case CONTROLLER_REVO:
switch (getVehicleType()) { switch (getVehicleType()) {
case VEHICLE_FIXEDWING: case VEHICLE_FIXEDWING:
return PAGE_OUTPUT_CALIBRATION; return PAGE_OUTPUT_CALIBRATION;
default: default:
return PAGE_BIAS_CALIBRATION; return PAGE_BIAS_CALIBRATION;
} }
@ -364,18 +368,18 @@ QString SetupWizard::getSummaryText()
summary.append("<br>"); summary.append("<br>");
summary.append("<b>").append(tr("GPS type: ")).append("</b>"); summary.append("<b>").append(tr("GPS type: ")).append("</b>");
switch (getGpsType()) { switch (getGpsType()) {
case GPS_PLAT: case GPS_PLAT:
summary.append(tr("OpenPilot Platinum")); summary.append(tr("OpenPilot Platinum"));
break; break;
case GPS_UBX: case GPS_UBX:
summary.append(tr("OpenPilot v8 or Generic UBLOX GPS")); summary.append(tr("OpenPilot v8 or Generic UBLOX GPS"));
break; break;
case GPS_NMEA: case GPS_NMEA:
summary.append(tr("Generic NMEA GPS")); summary.append(tr("Generic NMEA GPS"));
break; break;
default: default:
summary.append(tr("None")); summary.append(tr("None"));
} }
} }
// Show Airspeed sensor type // Show Airspeed sensor type
@ -383,18 +387,18 @@ QString SetupWizard::getSummaryText()
summary.append("<br>"); summary.append("<br>");
summary.append("<b>").append(tr("Airspeed Sensor: ")).append("</b>"); summary.append("<b>").append(tr("Airspeed Sensor: ")).append("</b>");
switch (getAirspeedType()) { switch (getAirspeedType()) {
case ESTIMATE: case ESTIMATE:
summary.append(tr("Software Estimated")); summary.append(tr("Software Estimated"));
break; break;
case EAGLETREE: case EAGLETREE:
summary.append(tr("EagleTree on Flexi-Port")); summary.append(tr("EagleTree on Flexi-Port"));
break; break;
case MS4525: case MS4525:
summary.append(tr("MS4525 based on Flexi-Port")); summary.append(tr("MS4525 based on Flexi-Port"));
break; break;
default: default:
summary.append(tr("Unknown")); summary.append(tr("Unknown"));
} }
} }
/* /*

6
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
View File

@ -71,9 +71,9 @@ public:
virtual VehicleConfigurationSource::CONTROLLER_TYPE getControllerType() const = 0; virtual VehicleConfigurationSource::CONTROLLER_TYPE getControllerType() const = 0;
virtual VehicleConfigurationSource::VEHICLE_TYPE getVehicleType() const = 0; virtual VehicleConfigurationSource::VEHICLE_TYPE getVehicleType() const = 0;
virtual VehicleConfigurationSource::VEHICLE_SUB_TYPE getVehicleSubType() const = 0; virtual VehicleConfigurationSource::VEHICLE_SUB_TYPE getVehicleSubType() const = 0;
virtual VehicleConfigurationSource::INPUT_TYPE getInputType() const = 0; virtual VehicleConfigurationSource::INPUT_TYPE getInputType() const = 0;
virtual VehicleConfigurationSource::ESC_TYPE getEscType() const = 0; virtual VehicleConfigurationSource::ESC_TYPE getEscType() const = 0;
virtual VehicleConfigurationSource::SERVO_TYPE getServoType() const = 0; virtual VehicleConfigurationSource::SERVO_TYPE getServoType() const = 0;
virtual VehicleConfigurationSource::AIRSPEED_TYPE getAirspeedType() const = 0; virtual VehicleConfigurationSource::AIRSPEED_TYPE getAirspeedType() const = 0;
virtual VehicleConfigurationSource::GPS_TYPE getGpsType() const = 0; virtual VehicleConfigurationSource::GPS_TYPE getGpsType() const = 0;
virtual VehicleConfigurationSource::RADIO_SETTING getRadioSetting() const = 0; virtual VehicleConfigurationSource::RADIO_SETTING getRadioSetting() const = 0;