Commit 2a3619ce authored by Gus Grubba's avatar Gus Grubba

Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into mavlinkStatus

parents b5f30ae4 095964c5
#!/bin/bash #!/bin/bash
# This is set to find lupdate in my particular installation. You will need to set the path # This is set to find lupdate in my particular installation. You will need to set the path
# where you have Qt installed. # where you have Qt installed.
QT_PATH=~/Applications/Qt/5.9.1/clang_64/bin QT_PATH=~/Applications/Qt/5.11.0/clang_64/bin
$QT_PATH/lupdate ../src -ts qgc.ts $QT_PATH/lupdate ../src -ts qgc.ts
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -847,8 +847,8 @@ void Vehicle::_handleEstimatorStatus(mavlink_message_t& message) ...@@ -847,8 +847,8 @@ void Vehicle::_handleEstimatorStatus(mavlink_message_t& message)
float pos_horiz_accuracy; /*< Horizontal position 1-STD accuracy relative to the EKF local origin (m)*/ float pos_horiz_accuracy; /*< Horizontal position 1-STD accuracy relative to the EKF local origin (m)*/
float pos_vert_accuracy; /*< Vertical position 1-STD accuracy relative to the EKF local origin (m)*/ float pos_vert_accuracy; /*< Vertical position 1-STD accuracy relative to the EKF local origin (m)*/
uint16_t flags; /*< Integer bitmask indicating which EKF outputs are valid. See definition for ESTIMATOR_STATUS_FLAGS.*/ uint16_t flags; /*< Integer bitmask indicating which EKF outputs are valid. See definition for ESTIMATOR_STATUS_FLAGS.*/
}) mavlink_estimator_status_t; } mavlink_estimator_status_t;
};
#endif #endif
} }
......
...@@ -474,8 +474,8 @@ private: ...@@ -474,8 +474,8 @@ private:
float pos_horiz_accuracy; /*< Horizontal position 1-STD accuracy relative to the EKF local origin (m)*/ float pos_horiz_accuracy; /*< Horizontal position 1-STD accuracy relative to the EKF local origin (m)*/
float pos_vert_accuracy; /*< Vertical position 1-STD accuracy relative to the EKF local origin (m)*/ float pos_vert_accuracy; /*< Vertical position 1-STD accuracy relative to the EKF local origin (m)*/
uint16_t flags; /*< Integer bitmask indicating which EKF outputs are valid. See definition for ESTIMATOR_STATUS_FLAGS.*/ uint16_t flags; /*< Integer bitmask indicating which EKF outputs are valid. See definition for ESTIMATOR_STATUS_FLAGS.*/
}) mavlink_estimator_status_t; } mavlink_estimator_status_t;
};
#endif #endif
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment