Browse Source

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

QGC4.4
Julian Oes 11 years ago
parent
commit
08d06d2c7f
  1. 4
      src/uas/UAS.h
  2. 2
      src/ui/uas/UASControlWidget.cc

4
src/uas/UAS.h

@ -569,8 +569,10 @@ public: @@ -569,8 +569,10 @@ public:
bool isAuto();
/** @brief Check if vehicle is armed */
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; }
/** @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 **/
UASWaypointManager* getWaypointManager() {

2
src/ui/uas/UASControlWidget.cc

@ -246,7 +246,7 @@ void UASControlWidget::transmitMode() @@ -246,7 +246,7 @@ void UASControlWidget::transmitMode()
UAS* uas = dynamic_cast<UAS*>(uas_iface);
if (uas->isHilEnabled()) {
if (uas->isHilEnabled() || uas->isHilActive()) {
mode.baseMode |= MAV_MODE_FLAG_HIL_ENABLED;
} else {
mode.baseMode &= ~MAV_MODE_FLAG_HIL_ENABLED;

Loading…
Cancel
Save