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-454 Vehicle wizard: Adjust UBXDynamicModel for surface vehicles

Browse Source
This commit is contained in:
Laurent Lalanne 2016-12-19 21:20:23 +01:00
parent 86bde01643
commit 7f53274c74
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,11 +304,21 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
case VehicleConfigurationSource::GPS_UBX: case VehicleConfigurationSource::GPS_UBX:
gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX; gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX;
gpsData.UbxAutoConfig = GPSSettings::UBXAUTOCONFIG_AUTOBAUDANDCONFIGURE; gpsData.UbxAutoConfig = GPSSettings::UBXAUTOCONFIG_AUTOBAUDANDCONFIGURE;
if (m_configSource->getVehicleType() == VehicleConfigurationSource::VEHICLE_SURFACE) {
gpsData.UbxDynamicModel = GPSSettings::UBXDYNAMICMODEL_AUTOMOTIVE;
} else {
gpsData.UbxDynamicModel = GPSSettings::UBXDYNAMICMODEL_AIRBORNE1G;
}
break; break;
case VehicleConfigurationSource::GPS_PLATINUM: case VehicleConfigurationSource::GPS_PLATINUM:
{ {
gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX; gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX;
gpsData.UbxAutoConfig = GPSSettings::UBXAUTOCONFIG_AUTOBAUDANDCONFIGURE; gpsData.UbxAutoConfig = GPSSettings::UBXAUTOCONFIG_AUTOBAUDANDCONFIGURE;
if (m_configSource->getVehicleType() == VehicleConfigurationSource::VEHICLE_SURFACE) {
gpsData.UbxDynamicModel = GPSSettings::UBXDYNAMICMODEL_AUTOMOTIVE;
} else {
gpsData.UbxDynamicModel = GPSSettings::UBXDYNAMICMODEL_AIRBORNE1G;
}
AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager); AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager);
Q_ASSERT(magSettings); Q_ASSERT(magSettings);
AuxMagSettings::DataFields magsData = magSettings->getData(); AuxMagSettings::DataFields magsData = magSettings->getData();
@ -339,6 +349,11 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX; gpsData.DataProtocol = GPSSettings::DATAPROTOCOL_UBX;
gpsData.UbxAutoConfig = GPSSettings::UBXAUTOCONFIG_AUTOBAUDANDCONFIGURE; gpsData.UbxAutoConfig = GPSSettings::UBXAUTOCONFIG_AUTOBAUDANDCONFIGURE;
if (m_configSource->getVehicleType() == VehicleConfigurationSource::VEHICLE_SURFACE) {
gpsData.UbxDynamicModel = GPSSettings::UBXDYNAMICMODEL_AUTOMOTIVE;
} else {
gpsData.UbxDynamicModel = GPSSettings::UBXDYNAMICMODEL_AIRBORNE1G;
}
if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_SPARKY2) { if (m_configSource->getControllerType() == VehicleConfigurationSource::CONTROLLER_SPARKY2) {
data.SPK2_FlexiPort = HwSettings::SPK2_FLEXIPORT_I2C; data.SPK2_FlexiPort = HwSettings::SPK2_FLEXIPORT_I2C;
} else { } else {