Skip to content
Commit d18a6b85 authored by dogmaphobic's avatar dogmaphobic
Browse files

Merge remote-tracking branch 'MavLink/master' into logHandling

* MavLink/master:
  Warn on unsupported APM version
  APM stack does not support RC cal start/stop
  Harden code for missing params, handle APM special case
  Fix default comp id detection
  PX4 Firmware no longer requires mavlink USB start
  Standard sizing for QGCView::showDialog
  Standard sizing for QGCView::showDialog
  UAS Object: Avoid spamming the console on successful commands
  linux include required libraries
  Show enumStringValue if available
  Use combo box if enums available
  Set proper default mode for VTOL
  Teach mission manager about transition command
  Support camera and VTOL transition commands
  Better light disabled text color
  Add better button highlight color for light theme
  Change selected flight mode color
  Update README.md
  Simplifying Airframe config
  Fixing crash bug.

Conflicts:
	src/ui/MainWindow.cc
parents 939ee6f4 d8c45c77
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment