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

Merged in f5soh/librepilot/LP-247_Wizard_naza_gps (pull request #186)

Browse Source 
LP-247 Add Naza GPS to Wizard
This commit is contained in:
Lalanne Laurent 2016-03-03 15:28:09 +01:00
commit 98a83a5cf2
7 changed files with 2494 additions and 939 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,6 +237,9 @@ void ConnectionDiagram::setupGraphicsScene()
case VehicleConfigurationSource::GPS_PLATINUM: case VehicleConfigurationSource::GPS_PLATINUM:
elementsToShow << QString("%1OPGPS-v9").arg(prefix); elementsToShow << QString("%1OPGPS-v9").arg(prefix);
break; break;
case VehicleConfigurationSource::GPS_NAZA:
elementsToShow << QString("%1NazaGPS").arg(prefix);
break;
case VehicleConfigurationSource::GPS_UBX: case VehicleConfigurationSource::GPS_UBX:
elementsToShow << QString("%1OPGPS-v8-ublox").arg(prefix); elementsToShow << QString("%1OPGPS-v8-ublox").arg(prefix);
break; break;

5
ground/gcs/src/plugins/setupwizard/pages/gpspage.cpp
View File

@ -83,6 +83,11 @@ void GpsPage::setupSelection(Selection *selection)
"OPGPS-v9", "OPGPS-v9",
SetupWizard::GPS_PLATINUM); SetupWizard::GPS_PLATINUM);
selection->addItem(tr("Naza GPS"),
tr("Select this option to use the Naza GPS with integrated Magnetometer."),
"NazaGPS",
SetupWizard::GPS_NAZA);
selection->addItem(tr("U-Blox Based + Magnetometer"), selection->addItem(tr("U-Blox Based + Magnetometer"),
tr("Select this option for the generic U-Blox chipset based GPS + I2C Magnetometer.\n\n" tr("Select this option for the generic U-Blox chipset based GPS + I2C Magnetometer.\n\n"
"GPS is connected to MainPort and two wires I2C to FlexiPort."), "GPS is connected to MainPort and two wires I2C to FlexiPort."),

1586
ground/gcs/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: 3.2 MiB

After

Width:  |  Height:  |  Size: 3.4 MiB

1821
ground/gcs/src/plugins/setupwizard/resources/sensor-shapes.svg
View File

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

Before

Width:  |  Height:  |  Size: 485 KiB

After

Width:  |  Height:  |  Size: 581 KiB

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

@ -434,6 +434,9 @@ QString SetupWizard::getSummaryText()
case GPS_PLATINUM: case GPS_PLATINUM:
summary.append(tr("OpenPilot Platinum")); summary.append(tr("OpenPilot Platinum"));
break; break;
case GPS_NAZA:
summary.append(tr("Naza GPS"));
break;
case GPS_UBX_FLEXI_I2CMAG: case GPS_UBX_FLEXI_I2CMAG:
summary.append(tr("Generic UBLOX + I2C Magnetometer")); summary.append(tr("Generic UBLOX + I2C Magnetometer"));
break; break;

13
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -259,6 +259,19 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
addModifiedObject(magSettings, tr("Writing External Mag sensor settings")); addModifiedObject(magSettings, tr("Writing External Mag sensor settings"));
break; break;
} }
case VehicleConfigurationSource::GPS_NAZA:
{
gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_DJI;
gpsData.UbxAutoConfig = GPSSettings::UBXAUTOCONFIG_DISABLED;
AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager);
Q_ASSERT(magSettings);
AuxMagSettings::DataFields magsData = magSettings->getData();
magsData.Type = AuxMagSettings::TYPE_DJI;
magsData.Usage = AuxMagSettings::USAGE_AUXONLY;
magSettings->setData(magsData);
addModifiedObject(magSettings, tr("Writing External Mag sensor settings"));
break;
}
case VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG: case VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG:
{ {
gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX; gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX;

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

@ -68,7 +68,7 @@ public:
enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN }; enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN };
enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_SRXL, INPUT_HOTT_SUMD, INPUT_EXBUS, INPUT_UNKNOWN }; enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_SRXL, INPUT_HOTT_SUMD, INPUT_EXBUS, INPUT_UNKNOWN };
enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED }; enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED };
enum GPS_TYPE { GPS_PLATINUM, GPS_UBX_FLEXI_I2CMAG, GPS_UBX, GPS_NMEA, GPS_DISABLED }; enum GPS_TYPE { GPS_PLATINUM, GPS_NAZA, GPS_UBX_FLEXI_I2CMAG, GPS_UBX, GPS_NMEA, GPS_DISABLED };
enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED }; enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED };
virtual VehicleConfigurationSource::CONTROLLER_TYPE getControllerType() const = 0; virtual VehicleConfigurationSource::CONTROLLER_TYPE getControllerType() const = 0;