Skip to content
Commit 91673ba1 authored by Gus Grubba's avatar Gus Grubba
Browse files

Merge branch 'cameraControl' into camControl

* cameraControl: (51 commits)
  Debug info
  Adding support for custom value.
  Parse min, max, step and unit off camera definition file Ignore Fact index if there are no enums (avoid adding an "Unknown" entry) Add function to convert and clamp a (Fact) value.
  Adding support for booleans Adding some more logging
  Keep asking for capture status while camera is not idle.
  Define how long to wait for RTSP frame before deciding the link is gone.
  Toggle video stream full screen
  Enable/Disable Offline maps import/export.
  Vehicle UID
  Handle capture status retries when capturing images. Allow plugin to validate parameter setting.
  Keep track of photo status (image capture) Don't allow "Take Photo" is status is not idle. Handle In Progress response (basically, do nothing) Request capture status when stopping video recording.
  For whatever reason, showing the dialog through a function causes a crash in QML (undebugable--new word!)
  Revert "Build fix due to MAVLink update."
  Revert "MAVLink signing (WIP)"
  Make custom dialog into a function Internet available now has a signal
  Wait a bit between reset and request parameters
  Build fix due to MAVLink update.
  MAVLink signing (WIP)
  Fixing uninitialized variable warning.
  Make slots protected instead of private.
  ...

# Conflicts:
#	src/FirmwarePlugin/FirmwarePlugin.cc
#	src/FlightDisplay/FlightDisplayView.qml
#	src/FlightDisplay/FlightDisplayViewVideo.qml
#	src/MissionManager/MissionManager.cc
#	src/Vehicle/Vehicle.cc
#	src/Vehicle/Vehicle.h
#	src/api/QGCCorePlugin.h
parents b93d3944 e2a03fe8
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