|
|
|
@ -500,7 +500,7 @@ bool MissionController::_loadJsonMissionFileV2(const QJsonObject& json, QmlObjec
@@ -500,7 +500,7 @@ bool MissionController::_loadJsonMissionFileV2(const QJsonObject& json, QmlObjec
|
|
|
|
|
{ _jsonPlannedHomePositionKey, QJsonValue::Array, true }, |
|
|
|
|
{ _jsonItemsKey, QJsonValue::Array, true }, |
|
|
|
|
{ _jsonFirmwareTypeKey, QJsonValue::Double, true }, |
|
|
|
|
{ _jsonVehicleTypeKey, QJsonValue::Double, true }, |
|
|
|
|
{ _jsonVehicleTypeKey, QJsonValue::Double, false }, |
|
|
|
|
{ _jsonCruiseSpeedKey, QJsonValue::Double, false }, |
|
|
|
|
{ _jsonHoverSpeedKey, QJsonValue::Double, false }, |
|
|
|
|
}; |
|
|
|
@ -515,8 +515,10 @@ bool MissionController::_loadJsonMissionFileV2(const QJsonObject& json, QmlObjec
@@ -515,8 +515,10 @@ bool MissionController::_loadJsonMissionFileV2(const QJsonObject& json, QmlObjec
|
|
|
|
|
|
|
|
|
|
if (_masterController->offline()) { |
|
|
|
|
// We only update if offline since if we are online we use the online vehicle settings
|
|
|
|
|
appSettings->offlineEditingFirmwareType()->setRawValue(AppSettings::offlineEditingFirmwareTypeFromFirmwareType((MAV_AUTOPILOT)json[_jsonVehicleTypeKey].toInt())); |
|
|
|
|
appSettings->offlineEditingVehicleType()->setRawValue(AppSettings::offlineEditingVehicleTypeFromVehicleType((MAV_TYPE)json[_jsonVehicleTypeKey].toInt())); |
|
|
|
|
appSettings->offlineEditingFirmwareType()->setRawValue(AppSettings::offlineEditingFirmwareTypeFromFirmwareType((MAV_AUTOPILOT)json[_jsonFirmwareTypeKey].toInt())); |
|
|
|
|
if (json.contains(_jsonVehicleTypeKey)) { |
|
|
|
|
appSettings->offlineEditingVehicleType()->setRawValue(AppSettings::offlineEditingVehicleTypeFromVehicleType((MAV_TYPE)json[_jsonVehicleTypeKey].toInt())); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
if (json.contains(_jsonCruiseSpeedKey)) { |
|
|
|
|
appSettings->offlineEditingCruiseSpeed()->setRawValue(json[_jsonCruiseSpeedKey].toDouble()); |
|
|
|
|