• Gus Grubba's avatar
    Merge branch 'AirMapWithAirmapd' into Airmap · e8b37fc8
    Gus Grubba authored
    * AirMapWithAirmapd: (33 commits)
      qgroundcontrol.pro: update build to latest airmapd master
      AirMapManager: update authorizations to changed airmapd interface
      rebase fixup: remove AirMapController.{cc,h}
      remove submodule commits qmqtt and tiny-AES128-C
      AirMapManager: error handling, change to updated API of airmapd
      AirMapManager: update polygons to changed airmapd interface
      AirMapManager: update flight search according to updated airmapd
      AirMap: remove SITA registration numbers
      AirspaceManagement & AirMapManager: add weather request API
      AirMapManager: add LifetimeChecker class to prevent callbacks from accessing invalid memory
      AirMapManager: handle multi_polygon
      AirMapManager: change backend to use airmapd
      AirMap: refactor for multi-vehicle support & base class API
      AirMap traffic: remove inactive vehicles after a timeout of 5 seconds
      AirMapManager: handle dynamic setting changes
      AirmapManager: make sure to pass the SITA reg data to the right objects
      Make AirMapController as part of a Vehicle rather than a creatable QML instance. This is ultimately linked to a vehicle and not the view. Eventually a lot of the code currently in AirMapManager will have to come here as well so the data persists with a vehicle. AirMapManager should only handle the global aspects. Added a temporary indicator right below the toolbar. It's only visible if a permission (of any kind) exists. I need to understand better how this works before coming up with a more permanent solution. Restored toolbar to its original state (brand logo and whatnot)
      Added include and lib path for protobuf on maxOS (we need to make this automatic for all builds) Added AirMap settings (SettingsGroup) Added AirMap settings block to General Settings Create macros to deal with the tedious repetitions within SettingsGroup Removed old, hacked in setting for AirMapKey Remove a few of the tons of build warnings
      PlanManager: upload flight to AirMap when uploading to the vehicle
      AirMapController: add flightPermitStatusChanged
      ...
    
    # Conflicts:
    #	src/QGCApplication.cc
    #	src/Vehicle/Vehicle.cc
    #	src/Vehicle/Vehicle.h
    e8b37fc8
Name
Last commit
Last update
..
linechart Loading commit data...
preferences Loading commit data...
toolbar Loading commit data...
uas Loading commit data...
AppSettings.qml Loading commit data...
HILDockWidget.cc Loading commit data...
HILDockWidget.h Loading commit data...
InputConfiguration.cc Loading commit data...
Linechart.ui Loading commit data...
MAVLinkDecoder.cc Loading commit data...
MAVLinkDecoder.h Loading commit data...
MainWindow.cc Loading commit data...
MainWindow.h Loading commit data...
MainWindow.ui Loading commit data...
MainWindowHybrid.qml Loading commit data...
MainWindowInner.qml Loading commit data...
MainWindowNative.qml Loading commit data...
MultiVehicleDockWidget.cc Loading commit data...
MultiVehicleDockWidget.h Loading commit data...
MultiVehicleDockWidget.ui Loading commit data...
QGCHilConfiguration.cc Loading commit data...
QGCHilConfiguration.h Loading commit data...
QGCHilConfiguration.ui Loading commit data...
QGCHilFlightGearConfiguration.cc Loading commit data...
QGCHilFlightGearConfiguration.h Loading commit data...
QGCHilFlightGearConfiguration.ui Loading commit data...
QGCHilJSBSimConfiguration.cc Loading commit data...
QGCHilJSBSimConfiguration.h Loading commit data...
QGCHilJSBSimConfiguration.ui Loading commit data...
QGCHilXPlaneConfiguration.cc Loading commit data...
QGCHilXPlaneConfiguration.h Loading commit data...
QGCHilXPlaneConfiguration.ui Loading commit data...
QGCMAVLinkInspector.cc Loading commit data...
QGCMAVLinkInspector.h Loading commit data...
QGCMAVLinkInspector.ui Loading commit data...
QGCMAVLinkLogPlayer.cc Loading commit data...
QGCMAVLinkLogPlayer.h Loading commit data...
QGCMAVLinkLogPlayer.ui Loading commit data...
QGCMapRCToParamDialog.cpp Loading commit data...
QGCMapRCToParamDialog.h Loading commit data...
QGCMapRCToParamDialog.ui Loading commit data...
QGCPluginHost.cc Loading commit data...
QGCPluginHost.h Loading commit data...
QGCPluginHost.ui Loading commit data...
QGCUASFileView.cc Loading commit data...
QGCUASFileView.h Loading commit data...
QGCUASFileView.ui Loading commit data...
QGCUASFileViewMulti.cc Loading commit data...
QGCUASFileViewMulti.h Loading commit data...
QGCUASFileViewMulti.ui Loading commit data...
QGCWebView.cc Loading commit data...
QGCWebView.h Loading commit data...
QGCWebView.ui Loading commit data...
QMap3D.ui Loading commit data...