Merged in filnet/librepilot/LP-109_video_gadget (pull request #454)

LP-109 video gadget

Approved-by: Philippe Renon <philippe_renon@yahoo.fr>
Approved-by: Lalanne Laurent <f5soh@free.fr>
Approved-by: Jan NIJS <dr.oblivium@gmail.com>
Approved-by: Brian Webb <webbbn@gmail.com>

Author: filnet

.drone.yml

@@ -9,7 +9,9 @@ build:
     - if [ $$arch = 32 ]; then target=i686; fi
     - if [ $$arch = 64 ]; then target=x86_64; fi
     - echo -e "[librepilot-mingw]\nSigLevel = Optional TrustAll\nServer = http://download.librepilot.org/repo/mingw" >> /etc/pacman.conf
-    - pacman -Syu --noconfirm --noprogressbar --needed git unzip tar mingw-w64-${target}-toolchain mingw-w64-${target}-ccache mingw-w64-${target}-ntldd mingw-w64-${target}-qt5 mingw-w64-${target}-SDL mingw-w64-${target}-mesa mingw-w64-${target}-openssl mingw-w64-${target}-gdal-minimal mingw-w64-${target}-OpenSceneGraph mingw-w64-${target}-osgearth
+    - pacman -Syu --noconfirm --noprogressbar --needed git unzip tar mingw-w64-${target}-toolchain mingw-w64-${target}-ccache mingw-w64-${target}-ntldd mingw-w64-${target}-qt5 mingw-w64-${target}-SDL mingw-w64-${target}-mesa mingw-w64-${target}-openssl
+    - pacman -Syu --noconfirm --noprogressbar --needed mingw-w64-${target}-gdal-minimal mingw-w64-${target}-OpenSceneGraph mingw-w64-${target}-osgearth
+    - pacman -Syu --noconfirm --noprogressbar --needed mingw-w64-${target}-gstreamer mingw-w64-${target}-gst-plugins-base mingw-w64-${target}-gst-plugins-good mingw-w64-${target}-gst-plugins-bad
     - mingw32-make all_sdk_install
     - git config core.filemode false
     - mingw32-make build-info && cat build/build-info.txt

Makefile

@@ -131,16 +131,22 @@ ifeq ($(UNAME), Linux)
     GCS_WITH_OSG      := 1
     GCS_WITH_OSGEARTH := 1
     GCS_COPY_OSG      := 0
+    GCS_WITH_GSTREAMER := 0
+    GCS_COPY_GSTREAMER := 0
 else ifeq ($(UNAME), Darwin)
     UAVOBJGENERATOR   := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator
     GCS_WITH_OSG      := 1
     GCS_WITH_OSGEARTH := 0
     GCS_COPY_OSG      := 1
+    GCS_WITH_GSTREAMER := 0
+    GCS_COPY_GSTREAMER := 0
 else ifeq ($(UNAME), Windows)
     UAVOBJGENERATOR := $(BUILD_DIR)/uavobjgenerator/uavobjgenerator.exe
     GCS_WITH_OSG      := 1
     GCS_WITH_OSGEARTH := 1
     GCS_COPY_OSG      := 1
+    GCS_WITH_GSTREAMER := 1
+    GCS_COPY_GSTREAMER := 1
 endif
 
 export UAVOBJGENERATOR
@@ -159,6 +165,13 @@ ifeq ($(GCS_WITH_OSG), 1)
     endif
 endif
 
+ifeq ($(GCS_WITH_GSTREAMER), 1)
+    GCS_EXTRA_CONF += gstreamer
+    ifeq ($(GCS_COPY_GSTREAMER), 1)
+        GCS_EXTRA_CONF += copy_gstreamer
+    endif
+endif
+
 ##############################
 #
 # All targets
@@ -590,6 +603,10 @@ config_help:
 	@$(ECHO) "       (Needed unless using system versions)"
 	@$(ECHO) "       Options: 0 or 1"
 	@$(ECHO)
+	@$(ECHO) "   GCS_WITH_GSTREAMER=$(GCS_WITH_GSTREAMER)"
+	@$(ECHO) "       Build the GCS with GStreamer support, this enables the video gadget and extra PFD video views"
+	@$(ECHO) "       Options: 0 or 1"
+	@$(ECHO)
 	@$(ECHO) "   CCACHE=$(CCACHE)"
 	@$(ECHO) "       A prefix to compiler invocations, usually 'ccache' or 'path/to/ccache'"
 	@$(ECHO)

flight/pios/common/pios_board_io.c

@@ -545,6 +545,7 @@ void PIOS_BOARD_IO_Configure_GCS_RCVR()
 void PIOS_BOARD_IO_Configure_OPLink_RCVR()
 {
     uint32_t pios_oplinkrcvr_id;
+
     OPLinkReceiverInitialize();
 #if defined(PIOS_INCLUDE_RFM22B)
     PIOS_OPLinkRCVR_Init(&pios_oplinkrcvr_id, pios_rfm22b_id);

flight/pios/common/pios_ms56xx.c

@@ -34,12 +34,12 @@
 #define POW2(x) (1 << x)
 
 // Command addresses
-#define MS56XX_RESET      0x1E
-#define MS56XX_CALIB_ADDR 0xA2 /* First sample is factory stuff */
-#define MS56XX_CALIB_LEN  16
-#define MS56XX_ADC_READ   0x00
-#define MS56XX_PRES_ADDR  0x40
-#define MS56XX_TEMP_ADDR  0x50
+#define MS56XX_RESET               0x1E
+#define MS56XX_CALIB_ADDR          0xA2 /* First sample is factory stuff */
+#define MS56XX_CALIB_LEN           16
+#define MS56XX_ADC_READ            0x00
+#define MS56XX_PRES_ADDR           0x40
+#define MS56XX_TEMP_ADDR           0x50
 
 // Option to change the interleave between Temp and Pressure conversions
 // Undef for normal operation
@@ -128,7 +128,7 @@ const PIOS_SENSORS_Driver PIOS_MS56xx_Driver = {
  */
 void PIOS_MS56xx_Init(const struct pios_ms56xx_cfg *cfg, int32_t i2c_device)
 {
-    i2c_id = i2c_device;
+    i2c_id  = i2c_device;
 
     ms56xx_address = cfg->address;
     version = cfg->version;
@@ -262,14 +262,14 @@ int32_t PIOS_MS56xx_ReadADC(void)
         // Offset and sensitivity at actual temperature
         if (version == MS56XX_VERSION_5611) {
             // OFF = OFFT1 + TCO * dT = C2 * 2^16 + (C4 * dT) / 2^7
-            Offset   = ((int64_t)CalibData.C[1]) * POW2(16) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(7) - Offset2;
+            Offset = ((int64_t)CalibData.C[1]) * POW2(16) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(7) - Offset2;
             // SENS = SENST1 + TCS * dT = C1 * 2^15 + (C3 * dT) / 2^8
-            Sens     = ((int64_t)CalibData.C[0]) * POW2(15) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(8) - Sens2;
+            Sens   = ((int64_t)CalibData.C[0]) * POW2(15) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(8) - Sens2;
         } else {
             // OFF = OFFT1 + TCO * dT = C2 * 2^17 + (C4 * dT) / 2^6
-            Offset   = ((int64_t)CalibData.C[1]) * POW2(17) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(6) - Offset2;
+            Offset = ((int64_t)CalibData.C[1]) * POW2(17) + (((int64_t)CalibData.C[3]) * deltaTemp) / POW2(6) - Offset2;
             // SENS = SENST1 + TCS * dT = C1 * 2^16 + (C3 * dT) / 2^7
-            Sens     = ((int64_t)CalibData.C[0]) * POW2(16) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(7) - Sens2;
+            Sens   = ((int64_t)CalibData.C[0]) * POW2(16) + (((int64_t)CalibData.C[2]) * deltaTemp) / POW2(7) - Sens2;
         }
 
         // Temperature compensated pressure (10…1200mbar with 0.01mbar resolution)
@@ -516,10 +516,11 @@ bool PIOS_MS56xx_driver_poll(__attribute__((unused)) uintptr_t context)
 }
 
 /* Poll the pressure sensor and return the temperature and pressure. */
-bool PIOS_MS56xx_Read(float *temperature, float *pressure) {
+bool PIOS_MS56xx_Read(float *temperature, float *pressure)
+{
     if (PIOS_MS56xx_driver_poll(0)) {
         *temperature = results.temperature;
-        *pressure = results.sample;
+        *pressure    = results.sample;
         return true;
     }
     return false;

flight/pios/common/pios_oplinkrcvr.c

@@ -38,7 +38,7 @@
 #include <pios_oplinkrcvr_priv.h>
 
 // Put receiver in failsafe if not updated within timeout
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
+#define PIOS_OPLINK_RCVR_TIMEOUT_MS 100
 
 /* Provide a RCVR driver */
 static int32_t PIOS_OPLinkRCVR_Get(uint32_t rcvr_id, uint8_t channel);

flight/targets/boards/revolution/pios_board.h

@@ -1,4 +1,3 @@
-
 /**
  ******************************************************************************
  * @addtogroup OpenPilotSystem OpenPilot System

flight/targets/boards/sparky2/pios_board.h

@@ -1,4 +1,3 @@
-
 /**
  ******************************************************************************
  * @addtogroup OpenPilotSystem OpenPilot System

ground/gcs/copydata.pro

@@ -91,7 +91,7 @@ win32 {
 
     for(dll, QT_DLLS) {
         addCopyFileTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
-        win32:addCopyDependenciesTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
+        addCopyDependenciesTarget($${dll},$$[QT_INSTALL_BINS],$${GCS_APP_PATH})
     }
 
     # copy OpenSSL DLLs

ground/gcs/src/app/main.cpp

@@ -280,6 +280,10 @@ void systemInit()
     QSurfaceFormat format = QSurfaceFormat::defaultFormat();
     format.setSwapInterval(0);
     QSurfaceFormat::setDefaultFormat(format);
+
+    // see https://bugreports.qt.io/browse/QTBUG-40332
+    int timeout = std::numeric_limits<int>::max();
+    qputenv("QT_BEARER_POLL_TIMEOUT", QString::number(timeout).toLatin1());
 }
 
 static FileLogger *logger = NULL;

ground/gcs/src/libs/extensionsystem/pluginerrorview.cpp

@@ -102,9 +102,11 @@ void PluginErrorView::update(PluginSpec *spec)
     case PluginSpec::Stopped:
         text    = tr("Stopped");
         tooltip = tr("Plugin was shut down");
+        break;
     case PluginSpec::Deleted:
         text    = tr("Deleted");
         tooltip = tr("Plugin ended its life cycle and was deleted");
+        break;
     }
     m_ui->state->setText(text);
     m_ui->state->setToolTip(tooltip);