Commit 08d06d2c authored by Julian Oes's avatar Julian Oes

uas: hack to include HIL bitfield when UAV is in HIL mode but not through QGC

parent 30cfe7e0
...@@ -569,8 +569,10 @@ public: ...@@ -569,8 +569,10 @@ public:
bool isAuto(); bool isAuto();
/** @brief Check if vehicle is armed */ /** @brief Check if vehicle is armed */
bool isArmed() const { return systemIsArmed; } bool isArmed() const { return systemIsArmed; }
/** @brief Check if vehicle is in HIL mode */ /** @brief Check if vehicle is supposed to be in HIL mode by the GS */
bool isHilEnabled() const { return hilEnabled; } bool isHilEnabled() const { return hilEnabled; }
/** @brief Check if vehicle is in HIL mode */
bool isHilActive() const { return base_mode & MAV_MODE_FLAG_HIL_ENABLED; }
/** @brief Get reference to the waypoint manager **/ /** @brief Get reference to the waypoint manager **/
UASWaypointManager* getWaypointManager() { UASWaypointManager* getWaypointManager() {
......
...@@ -246,7 +246,7 @@ void UASControlWidget::transmitMode() ...@@ -246,7 +246,7 @@ void UASControlWidget::transmitMode()
UAS* uas = dynamic_cast<UAS*>(uas_iface); UAS* uas = dynamic_cast<UAS*>(uas_iface);
if (uas->isHilEnabled()) { if (uas->isHilEnabled() || uas->isHilActive()) {
mode.baseMode |= MAV_MODE_FLAG_HIL_ENABLED; mode.baseMode |= MAV_MODE_FLAG_HIL_ENABLED;
} else { } else {
mode.baseMode &= ~MAV_MODE_FLAG_HIL_ENABLED; mode.baseMode &= ~MAV_MODE_FLAG_HIL_ENABLED;
......
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