Browse Source

Fix id screwup causing vehicle creation to break

QGC4.4
DonLakeFlyer 7 years ago
parent
commit
b4960fabcd
  1. 4
      src/Vehicle/Vehicle.cc
  2. 2
      src/Vehicle/Vehicle.h

4
src/Vehicle/Vehicle.cc

@ -797,10 +797,10 @@ void Vehicle::_handleDistanceSensor(mavlink_message_t& message) @@ -797,10 +797,10 @@ void Vehicle::_handleDistanceSensor(mavlink_message_t& message)
if (!_distanceSensorFactGroup.idSet()) {
_distanceSensorFactGroup.setIdSet(true);
_id = distanceSensor.id;
_distanceSensorFactGroup.setId(distanceSensor.id);
}
if (_id != distanceSensor.id) {
if (_distanceSensorFactGroup.id() != distanceSensor.id) {
// We can only handle a single sensor reporting
return;
}

2
src/Vehicle/Vehicle.h

@ -71,6 +71,8 @@ public: @@ -71,6 +71,8 @@ public:
bool idSet(void) { return _idSet; }
void setIdSet(bool idSet) { _idSet = idSet; }
uint8_t id(void) { return _id; }
void setId(uint8_t id) { _id = id; }
static const char* _rotationNoneFactName;
static const char* _rotationYaw45FactName;

Loading…
Cancel
Save