# Conflicts:
#	src/FlightDisplay/VirtualJoystick.qml
#	src/ui/preferences/GeneralSettings.qml

Error message indicates Qt 5.12 is required but in reality, it's 5.11. Android CI will need to be updated as it is still using 5.9.

Handle ArduPilot strangeness with respect to components and mavlink spec for params

Change joystick deadband adjustment to dragging horizontally

Improve virtual joystick functionality 

Handle ArduPilot strangeness with respect to components and mavlink spec for parameter messages

Restored FirmwareUpgrade.qml as it was beyond repair. Also fixed some issues that were present in the original, master version.
Added "hasAPMSupport" to QGroundControl global control. This is to determine if APM support is enabled or not.

# Conflicts:
#	qgroundcontrol.qrc
#	src/Microhard/MicrohardSettings.qml
#	src/VehicleSetup/FirmwareUpgrade.qml

Camera info requests

Firmware Upgrade: Use ArduPilot manifest to get firmware listings

Handle fmuv2/v3

Don't hideDialog when it doesn't flash

When the item is not visible, the width and height are not valid,
resulting in wrong output values
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Switch to using firmware manifest for ArduPilot flashing

Delay adding filesink to recording branch until after an I-frame arrives

PR Remove Microhard configuration for air and ground unit IPs as they're not needed.

Add NXP FMUK66V3 firmware urls

Fixed places where the font family was not being defined (therefore using the default system font)

Update throttle % fact from VFR_HUD message

Update throttle % fact from VFR_HUD message

# Conflicts:
#	src/QmlControls/PIDTuning.qml
#	src/ui/MainWindow.cc

ArduPilot: Flight Mode setup - Safer handling of missing params