Browse Source

fixed bugs

QGC4.4
honglang 3 years ago committed by Don Gagne
parent
commit
bdae920d59
  1. 4
      src/Vehicle/Vehicle.cc
  2. 2
      src/Vehicle/Vehicle.h
  3. 2
      src/Vehicle/VehicleHygrometerFactGroup.h

4
src/Vehicle/Vehicle.cc

@ -167,8 +167,8 @@ Vehicle::Vehicle(LinkInterface* link,
, _localPositionSetpointFactGroup(this) , _localPositionSetpointFactGroup(this)
, _escStatusFactGroup (this) , _escStatusFactGroup (this)
, _estimatorStatusFactGroup (this) , _estimatorStatusFactGroup (this)
, _terrainFactGroup (this)
, _hygrometerFactGroup (this) , _hygrometerFactGroup (this)
, _terrainFactGroup (this)
, _terrainProtocolHandler (new TerrainProtocolHandler(this, &_terrainFactGroup, this)) , _terrainProtocolHandler (new TerrainProtocolHandler(this, &_terrainFactGroup, this))
{ {
_linkManager = _toolbox->linkManager(); _linkManager = _toolbox->linkManager();
@ -446,8 +446,8 @@ void Vehicle::_commonInit()
_addFactGroup(&_localPositionSetpointFactGroup,_localPositionSetpointFactGroupName); _addFactGroup(&_localPositionSetpointFactGroup,_localPositionSetpointFactGroupName);
_addFactGroup(&_escStatusFactGroup, _escStatusFactGroupName); _addFactGroup(&_escStatusFactGroup, _escStatusFactGroupName);
_addFactGroup(&_estimatorStatusFactGroup, _estimatorStatusFactGroupName); _addFactGroup(&_estimatorStatusFactGroup, _estimatorStatusFactGroupName);
_addFactGroup(&_terrainFactGroup, _terrainFactGroupName);
_addFactGroup(&_hygrometerFactGroup, _hygrometerFactGroupName); _addFactGroup(&_hygrometerFactGroup, _hygrometerFactGroupName);
_addFactGroup(&_terrainFactGroup, _terrainFactGroupName);
// Add firmware-specific fact groups, if provided // Add firmware-specific fact groups, if provided
QMap<QString, FactGroup*>* fwFactGroups = _firmwarePlugin->factGroups(); QMap<QString, FactGroup*>* fwFactGroups = _firmwarePlugin->factGroups();

2
src/Vehicle/Vehicle.h

@ -1362,8 +1362,8 @@ private:
static const char* _localPositionSetpointFactGroupName; static const char* _localPositionSetpointFactGroupName;
static const char* _escStatusFactGroupName; static const char* _escStatusFactGroupName;
static const char* _estimatorStatusFactGroupName; static const char* _estimatorStatusFactGroupName;
static const char* _terrainFactGroupName;
static const char* _hygrometerFactGroupName; static const char* _hygrometerFactGroupName;
static const char* _terrainFactGroupName;
static const int _vehicleUIUpdateRateMSecs = 100; static const int _vehicleUIUpdateRateMSecs = 100;

2
src/Vehicle/VehicleHygrometerFactGroup.h

@ -37,7 +37,7 @@ public:
protected: protected:
void _handleHygrometerSensor (mavlink_message_t& message); void _handleHygrometerSensor (mavlink_message_t& message);
Fact _hygroIDFact;
Fact _hygroTempFact; Fact _hygroTempFact;
Fact _hygroHumiFact; Fact _hygroHumiFact;
Fact _hygroIDFact;
}; };

Loading…
Cancel
Save