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

OP-1491 Artwork fixes + wizard support - work in progress

Browse Source
This commit is contained in:
Laurent Lalanne 2014-09-16 00:48:45 +02:00
parent adeb51bb10
commit fb4b9b05cd
8 changed files with 14336 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3421
ground/openpilotgcs/src/plugins/config/images/multirotor-shapes.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 997 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

3
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
View File

@ -104,6 +104,9 @@ void ConnectionDiagram::setupGraphicsScene()
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
elementsToShow << "quad-p";
break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
elementsToShow << "quad-h";
break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
elementsToShow << "hexa";
break;

6
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
View File

@ -98,6 +98,9 @@ void MultiPage::setupMultiTypesCombo()
"This setup was one of the first to be used and is still used for sport flying. This configuration is not that well suited "
"for FPV since the fore rotor tend to be in the way of the camera.");
ui->typeCombo->addItem(tr("Quadcopter H"), SetupWizard::MULTI_ROTOR_QUAD_H);
m_descriptions << tr("Quadcopter H, Blackout mini");
ui->typeCombo->addItem(tr("Hexacopter"), SetupWizard::MULTI_ROTOR_HEXA);
m_descriptions << tr("Hexacopter");
@ -154,6 +157,9 @@ void MultiPage::updateImageAndDescription()
case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
elementId = "quad-plus";
break;
case SetupWizard::MULTI_ROTOR_QUAD_H:
elementId = "quad-H";
break;
case SetupWizard::MULTI_ROTOR_HEXA:
elementId = "quad-hexa";
break;

1456
ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 524 KiB

After

Width:  |  Height:  |  Size: 583 KiB

9761
ground/openpilotgcs/src/plugins/setupwizard/resources/multirotor-shapes.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 432 KiB

After

Width:  |  Height:  |  Size: 591 KiB

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

@ -197,6 +197,9 @@ QString SetupWizard::getSummaryText()
case SetupWizard::MULTI_ROTOR_QUAD_PLUS:
summary.append(tr("Quadcopter +"));
break;
case SetupWizard::MULTI_ROTOR_QUAD_H:
summary.append(tr("Quadcopter H"));
break;
case SetupWizard::MULTI_ROTOR_HEXA:
summary.append(tr("Hexacopter"));
break;

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

@ -198,6 +198,7 @@ void VehicleConfigurationHelper::applyVehicleConfiguration()
break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
setupQuadCopter();
break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA:
@ -272,6 +273,7 @@ void VehicleConfigurationHelper::applyActuatorConfiguration()
}
break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_X:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_PLUS:
data.ChannelUpdateFreq[0] = updateFrequence;
data.ChannelUpdateFreq[1] = updateFrequence;
@ -487,6 +489,11 @@ void VehicleConfigurationHelper::applyMixerConfiguration(mixerChannelSettings ch
mixSettings->setMixerValuePitch(100);
mixSettings->setMixerValueYaw(50);
break;
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
mixSettings->setMixerValueRoll(50);
mixSettings->setMixerValuePitch(70);
mixSettings->setMixerValueYaw(50);
break;
case VehicleConfigurationSource::MULTI_ROTOR_HEXA_COAX_Y:
mixSettings->setMixerValueRoll(100);
mixSettings->setMixerValuePitch(50);
@ -890,6 +897,44 @@ void VehicleConfigurationHelper::setupQuadCopter()
break;
}
case VehicleConfigurationSource::MULTI_ROTOR_QUAD_H:
{
frame = SystemSettings::AIRFRAMETYPE_QUADH;
channels[0].type = MIXER_TYPE_MOTOR;
channels[0].throttle1 = 100;
channels[0].throttle2 = 0;
channels[0].roll = 50;
channels[0].pitch = 70;
channels[0].yaw = -50;
channels[1].type = MIXER_TYPE_MOTOR;
channels[1].throttle1 = 100;
channels[1].throttle2 = 0;
channels[1].roll = -50;
channels[1].pitch = 70;
channels[1].yaw = 50;
channels[2].type = MIXER_TYPE_MOTOR;
channels[2].throttle1 = 100;
channels[2].throttle2 = 0;
channels[2].roll = -50;
channels[2].pitch = -70;
channels[2].yaw = -50;
channels[3].type = MIXER_TYPE_MOTOR;
channels[3].throttle1 = 100;
channels[3].throttle2 = 0;
channels[3].roll = 50;
channels[3].pitch = -70;
channels[3].yaw = 50;
guiSettings.multi.VTOLMotorNW = 1;
guiSettings.multi.VTOLMotorNE = 2;
guiSettings.multi.VTOLMotorSE = 3;
guiSettings.multi.VTOLMotorSW = 4;
break;
}
default:
break;
}

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

@ -57,7 +57,7 @@ public:
enum CONTROLLER_TYPE { CONTROLLER_UNKNOWN, CONTROLLER_CC, CONTROLLER_CC3D, CONTROLLER_REVO, CONTROLLER_OPLINK };
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_QUAD_H,
MULTI_ROTOR_HEXA, MULTI_ROTOR_HEXA_H, MULTI_ROTOR_HEXA_X, MULTI_ROTOR_HEXA_COAX_Y, MULTI_ROTOR_OCTO,
MULTI_ROTOR_OCTO_X, MULTI_ROTOR_OCTO_V, MULTI_ROTOR_OCTO_COAX_X, MULTI_ROTOR_OCTO_COAX_PLUS,
FIXED_WING_AILERON, FIXED_WING_VTAIL, HELI_CCPM };