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

OP-1493 Make Vehicle and TX Wizards work with the discoveryf4bare target

Browse Source
This commit is contained in:
Stefan Karlsson 2014-09-15 23:43:58 +02:00
parent dd86e7f9c4
commit 09a943f17f
7 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flight/targets/boards/discoveryf4bare/firmware/Makefile
View File

@ -34,8 +34,9 @@ USE_DSP_LIB ?= NO
#MODULES += Altitude/revolution #MODULES += Altitude/revolution
#MODULES += Airspeed #MODULES += Airspeed
#MODULES += AltitudeHold #MODULES += AltitudeHold
#MODULES += Stabilization MODULES += Stabilization
MODULES += ManualControl MODULES += ManualControl
MODULES += Receiver
MODULES += Actuator MODULES += Actuator
MODULES += GPS MODULES += GPS
MODULES += TxPID MODULES += TxPID

4
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
View File

@ -107,6 +107,9 @@ SetupWizard::CONTROLLER_TYPE ControllerPage::getControllerType()
case 0x0903: case 0x0903:
return SetupWizard::CONTROLLER_REVO; return SetupWizard::CONTROLLER_REVO;
case 0x0904:
return SetupWizard::CONTROLLER_DISCOVERYF4;
default: default:
return SetupWizard::CONTROLLER_UNKNOWN; return SetupWizard::CONTROLLER_UNKNOWN;
} }
@ -127,6 +130,7 @@ void ControllerPage::setupBoardTypes()
ui->boardTypeCombo->addItem(tr("OpenPilot CopterControl 3D"), SetupWizard::CONTROLLER_CC3D); ui->boardTypeCombo->addItem(tr("OpenPilot CopterControl 3D"), SetupWizard::CONTROLLER_CC3D);
ui->boardTypeCombo->addItem(tr("OpenPilot Revolution"), SetupWizard::CONTROLLER_REVO); ui->boardTypeCombo->addItem(tr("OpenPilot Revolution"), SetupWizard::CONTROLLER_REVO);
ui->boardTypeCombo->addItem(tr("OpenPilot OPLink Radio Modem"), SetupWizard::CONTROLLER_OPLINK); ui->boardTypeCombo->addItem(tr("OpenPilot OPLink Radio Modem"), SetupWizard::CONTROLLER_OPLINK);
ui->boardTypeCombo->addItem(tr("OpenPilot DiscoveryF4"), SetupWizard::CONTROLLER_DISCOVERYF4);
} }
void ControllerPage::setControllerType(SetupWizard::CONTROLLER_TYPE type) void ControllerPage::setControllerType(SetupWizard::CONTROLLER_TYPE type)

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

@ -94,6 +94,7 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
break; break;
} }
case SetupWizard::CONTROLLER_REVO: case SetupWizard::CONTROLLER_REVO:
case SetupWizard::CONTROLLER_DISCOVERYF4:
{ {
switch (selectedType) { switch (selectedType) {
case VehicleConfigurationSource::INPUT_PWM: case VehicleConfigurationSource::INPUT_PWM:

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

@ -83,6 +83,7 @@ int SetupWizard::nextId() const
case CONTROLLER_CC: case CONTROLLER_CC:
case CONTROLLER_CC3D: case CONTROLLER_CC3D:
case CONTROLLER_REVO: case CONTROLLER_REVO:
case CONTROLLER_DISCOVERYF4:
return PAGE_INPUT; return PAGE_INPUT;
case CONTROLLER_OPLINK: case CONTROLLER_OPLINK:
@ -141,6 +142,10 @@ int SetupWizard::nextId() const
case CONTROLLER_REVO: case CONTROLLER_REVO:
return PAGE_BIAS_CALIBRATION; return PAGE_BIAS_CALIBRATION;
case CONTROLLER_DISCOVERYF4:
// Skip calibration.
return PAGE_OUTPUT_CALIBRATION;
default: default:
return PAGE_NOTYETIMPLEMENTED; return PAGE_NOTYETIMPLEMENTED;
} }
@ -174,6 +179,9 @@ QString SetupWizard::getSummaryText()
case CONTROLLER_OPLINK: case CONTROLLER_OPLINK:
summary.append(tr("OpenPilot OPLink Radio Modem")); summary.append(tr("OpenPilot OPLink Radio Modem"));
break; break;
case CONTROLLER_DISCOVERYF4:
summary.append(tr("OpenPilot DiscoveryF4 Development Board"));
break;
default: default:
summary.append(tr("Unknown")); summary.append(tr("Unknown"));
break; break;

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

@ -148,6 +148,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
} }
break; break;
case VehicleConfigurationSource::CONTROLLER_REVO: case VehicleConfigurationSource::CONTROLLER_REVO:
case VehicleConfigurationSource::CONTROLLER_DISCOVERYF4:
// Reset all ports // Reset all ports
data.RM_RcvrPort = HwSettings::RM_RCVRPORT_DISABLED; data.RM_RcvrPort = HwSettings::RM_RCVRPORT_DISABLED;

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

@ -55,7 +55,7 @@ class VehicleConfigurationSource {
public: public:
VehicleConfigurationSource(); VehicleConfigurationSource();
enum CONTROLLER_TYPE { CONTROLLER_UNKNOWN, CONTROLLER_CC, CONTROLLER_CC3D, CONTROLLER_REVO, CONTROLLER_OPLINK }; enum CONTROLLER_TYPE { CONTROLLER_UNKNOWN, CONTROLLER_CC, CONTROLLER_CC3D, CONTROLLER_REVO, CONTROLLER_OPLINK, CONTROLLER_DISCOVERYF4 };
enum VEHICLE_TYPE { VEHICLE_UNKNOWN, VEHICLE_MULTI, VEHICLE_FIXEDWING, VEHICLE_HELI, VEHICLE_SURFACE }; enum VEHICLE_TYPE { VEHICLE_UNKNOWN, VEHICLE_MULTI, VEHICLE_FIXEDWING, VEHICLE_HELI, VEHICLE_SURFACE };
enum VEHICLE_SUB_TYPE { MULTI_ROTOR_UNKNOWN, MULTI_ROTOR_TRI_Y, MULTI_ROTOR_QUAD_X, MULTI_ROTOR_QUAD_PLUS, enum VEHICLE_SUB_TYPE { MULTI_ROTOR_UNKNOWN, MULTI_ROTOR_TRI_Y, MULTI_ROTOR_QUAD_X, MULTI_ROTOR_QUAD_PLUS,
MULTI_ROTOR_HEXA, MULTI_ROTOR_HEXA_H, MULTI_ROTOR_HEXA_X, MULTI_ROTOR_HEXA_COAX_Y, MULTI_ROTOR_OCTO, MULTI_ROTOR_HEXA, MULTI_ROTOR_HEXA_H, MULTI_ROTOR_HEXA_X, MULTI_ROTOR_HEXA_COAX_Y, MULTI_ROTOR_OCTO,

4
ground/openpilotgcs/src/plugins/uavobjectutil/devicedescriptorstruct.h
View File

@ -50,6 +50,10 @@ public:
// Revo Mini // Revo Mini
return QString("Revolution"); return QString("Revolution");
break;
case 0x0904:
return QString("DiscoveryF4");
break; break;
default: default:
return QString(""); return QString("");