Non-working transfer commit

src/uas/PxQuadMAV.cc

@@ -119,6 +119,12 @@ void PxQuadMAV::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit valueChanged(this, "Load", ((float)status.load)/1000.0f, MG::TIME::getGroundTimeNow());
             }
             break;
+        case MAVLINK_MSG_ID_CONTROL_STATUS:
+            {
+                mavlink_control_status_t status;
+                mavlink_msg_control_status_decode(&message, &status);
+            }
+            break;
     default:
             // Do nothing
             break;

src/uas/UASInterface.h

@@ -314,6 +314,30 @@ signals:
     void imageDataReceived(int imgid, const unsigned char* imageData, int length, int startIndex);
     /** @brief Emit the new system type */
     void systemTypeSet(UASInterface* uas, unsigned int type);
+    /** @brief Attitude control enabled/disabled */
+    void attitudeControlEnabled(bool enabled);
+    /** @brief Position 2D control enabled/disabled */
+    void positionXYControlEnabled(bool enabled);
+    /** @brief Altitude control enabled/disabled */
+    void positionZControlEnabled(bool enabled);
+    /** @brief Heading control enabled/disabled */
+    void positionYawControlEnabled(bool enabled);
+
+    /**
+     * @brief Localization quality changed
+     * @param fix 0: lost, 1: 2D local position hold, 2: 2D localization, 3: 3D localization
+     */
+    void localizationChanged(UASInterface* uas, int fix);
+    /**
+     * @brief GPS localization quality changed
+     * @param fix 0: lost, 1: at least one satellite, but no GPS fix, 2: 2D localization, 3: 3D localization
+     */
+    void gpsLocalizationChanged(UASInterface* uas, int fix);
+    /**
+     * @brief Vision localization quality changed
+     * @param fix 0: lost, 1: 2D local position hold, 2: 2D localization, 3: 3D localization
+     */
+    void visionLocalizationChanged(UASInterface* uas, int fix);
 };
 
 Q_DECLARE_INTERFACE(UASInterface, "org.qgroundcontrol/1.0");

src/ui/HSIDisplay.cc

@@ -372,6 +372,10 @@ void HSIDisplay::setActiveUAS(UASInterface* uas)
     connect(uas, SIGNAL(speedChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateSpeed(UASInterface*,double,double,double,quint64)));
     connect(uas, SIGNAL(attitudeChanged(UASInterface*,double,double,double,quint64)), this, SLOT(updateAttitude(UASInterface*,double,double,double,quint64)));
 
+    connect(uas, SIGNAL(attitudeControlEnabled(bool)), this, SLOT(updateAttitudeControllerEnabled(UASInterface*,bool)));
+    connect(uas, SIGNAL(positionXYControlEnabled(bool)), this, SLOT(updatePositionXYControllerEnabled(UASInterface*,bool)));
+    connect(uas, SIGNAL(positionZControlEnabled(bool)), this, SLOT(updatePositionZControllerEnabled(UASInterface*,bool)));
+    connect(uas, SIGNAL(positionYawControlEnabled(bool)), this, SLOT(updatePositionYawControllerEnabled(UASInterface*,bool)))
     // Now connect the new UAS
 
     //if (this->uas != uas)
@@ -701,6 +705,19 @@ void HSIDisplay::drawAltitudeSetpoint(float xRef, float yRef, float radius, cons
     //    paintText(label, color, 4.5f, xRef-7.5f, yRef-2.0f, painter);
 }
 
+/**
+ * @param fix 0: lost, 1: 2D local position hold, 2: 2D localization, 3: 3D localization
+ */
+void localizationChanged(UASInterface* uas, int fix);
+/**
+ * @param fix 0: lost, 1: at least one satellite, but no GPS fix, 2: 2D localization, 3: 3D localization
+ */
+void gpsLocalizationChanged(UASInterface* uas, int fix);
+/**
+ * @param fix 0: lost, 1: 2D local position hold, 2: 2D localization, 3: 3D localization
+ */
+void visionLocalizationChanged(UASInterface* uas, int fix);
+
 void HSIDisplay::updateJoystick(double roll, double pitch, double yaw, double thrust, int xHat, int yHat)
 {
 
@@ -710,3 +727,5 @@ void HSIDisplay::pressKey(int key)
 {
 
 }
+
+

src/ui/HSIDisplay.h

@@ -63,6 +63,31 @@ public slots:
     void updatePositionXYControllerEnabled(UASInterface* uas, bool enabled);
     void updatePositionZControllerEnabled(UASInterface* uas, bool enabled);
 
+    /** @brief Attitude control enabled/disabled */
+    void attitudeControlEnabled(bool enabled);
+    /** @brief Position 2D control enabled/disabled */
+    void positionXYControlEnabled(bool enabled);
+    /** @brief Altitude control enabled/disabled */
+    void positionZControlEnabled(bool enabled);
+    /** @brief Heading control enabled/disabled */
+    void positionYawControlEnabled(bool enabled);
+
+    /**
+     * @brief Localization quality changed
+     * @param fix 0: lost, 1: 2D local position hold, 2: 2D localization, 3: 3D localization
+     */
+    void updateLocalization(UASInterface* uas, int localization);
+    /**
+     * @brief GPS localization quality changed
+     * @param fix 0: lost, 1: at least one satellite, but no GPS fix, 2: 2D localization, 3: 3D localization
+     */
+    void updateGpsLocalization(UASInterface* uas, int localization);
+    /**
+     * @brief Vision localization quality changed
+     * @param fix 0: lost, 1: 2D local position hold, 2: 2D localization, 3: 3D localization
+     */
+    void updateVisionLocalization(UASInterface* uas, int localization);
+
     void paintEvent(QPaintEvent * event);
     /** @brief Update state from joystick */
     void updateJoystick(double roll, double pitch, double yaw, double thrust, int xHat, int yHat);