Commit 01a49a4c authored by DonLakeFlyer's avatar DonLakeFlyer

Anal logging to track down resume mission state problem

parent bfe6d609
...@@ -125,8 +125,7 @@ Item { ...@@ -125,8 +125,7 @@ Item {
property bool __pauseVehicleSupported: _activeVehicle ? _activeVehicle.pauseVehicleSupported : false property bool __pauseVehicleSupported: _activeVehicle ? _activeVehicle.pauseVehicleSupported : false
property bool __flightMode: _flightMode property bool __flightMode: _flightMode
/* // Hack debugging code
Leaving this code in for use while debugging
function _outputState() { function _outputState() {
console.log(qsTr("_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleInRTLMode(%5) pauseVehicleSupported(%6) _vehiclePaused(%7) _flightMode(%8)").arg(_activeVehicle ? 1 : 0).arg(_vehicleArmed ? 1 : 0).arg(__guidedModeSupported ? 1 : 0).arg(_vehicleFlying ? 1 : 0).arg(_vehicleInRTLMode ? 1 : 0).arg(__pauseVehicleSupported ? 1 : 0).arg(_vehiclePaused ? 1 : 0).arg(_flightMode)) console.log(qsTr("_activeVehicle(%1) _vehicleArmed(%2) guidedModeSupported(%3) _vehicleFlying(%4) _vehicleInRTLMode(%5) pauseVehicleSupported(%6) _vehiclePaused(%7) _flightMode(%8)").arg(_activeVehicle ? 1 : 0).arg(_vehicleArmed ? 1 : 0).arg(__guidedModeSupported ? 1 : 0).arg(_vehicleFlying ? 1 : 0).arg(_vehicleInRTLMode ? 1 : 0).arg(__pauseVehicleSupported ? 1 : 0).arg(_vehiclePaused ? 1 : 0).arg(_flightMode))
} }
...@@ -140,11 +139,25 @@ Item { ...@@ -140,11 +139,25 @@ Item {
on__GuidedModeSupportedChanged: _outputState() on__GuidedModeSupportedChanged: _outputState()
on__PauseVehicleSupportedChanged: _outputState() on__PauseVehicleSupportedChanged: _outputState()
on_CurrentMissionIndexChanged: console.log("_currentMissionIndex", _currentMissionIndex)
on_ResumeMissionIndexChanged: console.log("_resumeMissionIndex", _resumeMissionIndex)
onShowResumeMissionChanged: {
console.log("showResumeMission", showResumeMission)
_outputState()
}
onShowStartMissionChanged: {
console.log("showStartMission", showStartMission)
_outputState()
}
onShowContinueMissionChanged: {
console.log("showContinueMission", showContinueMission)
_outputState()
}
// End of hack // End of hack
*/
on_VehicleFlyingChanged: { on_VehicleFlyingChanged: {
//_outputState() _outputState()
if (!_vehicleFlying) { if (!_vehicleFlying) {
// We use _vehicleWasFLying to help trigger Resume Mission only if the vehicle actually flew and came back down. // We use _vehicleWasFLying to help trigger Resume Mission only if the vehicle actually flew and came back down.
// Otherwise it may trigger during the Start Mission sequence due to signal ordering or armed and resume mission index. // Otherwise it may trigger during the Start Mission sequence due to signal ordering or armed and resume mission index.
...@@ -153,8 +166,6 @@ Item { ...@@ -153,8 +166,6 @@ Item {
} }
property var _actionData property var _actionData
on_CurrentMissionIndexChanged: console.log("_currentMissionIndex", _currentMissionIndex)
on_FlightModeChanged: { on_FlightModeChanged: {
_vehiclePaused = _flightMode === _activeVehicle.pauseFlightMode _vehiclePaused = _flightMode === _activeVehicle.pauseFlightMode
_vehicleInRTLMode = _flightMode === _activeVehicle.rtlFlightMode _vehicleInRTLMode = _flightMode === _activeVehicle.rtlFlightMode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment