From bdae920d597de4bea981b52a3290058ca02e646d Mon Sep 17 00:00:00 2001 From: honglang Date: Tue, 23 Nov 2021 10:21:26 +0800 Subject: [PATCH] fixed bugs --- src/Vehicle/Vehicle.cc | 4 ++-- src/Vehicle/Vehicle.h | 2 +- src/Vehicle/VehicleHygrometerFactGroup.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index abbc77a..a305380 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -167,8 +167,8 @@ Vehicle::Vehicle(LinkInterface* link, , _localPositionSetpointFactGroup(this) , _escStatusFactGroup (this) , _estimatorStatusFactGroup (this) - , _terrainFactGroup (this) , _hygrometerFactGroup (this) + , _terrainFactGroup (this) , _terrainProtocolHandler (new TerrainProtocolHandler(this, &_terrainFactGroup, this)) { _linkManager = _toolbox->linkManager(); @@ -446,8 +446,8 @@ void Vehicle::_commonInit() _addFactGroup(&_localPositionSetpointFactGroup,_localPositionSetpointFactGroupName); _addFactGroup(&_escStatusFactGroup, _escStatusFactGroupName); _addFactGroup(&_estimatorStatusFactGroup, _estimatorStatusFactGroupName); - _addFactGroup(&_terrainFactGroup, _terrainFactGroupName); _addFactGroup(&_hygrometerFactGroup, _hygrometerFactGroupName); + _addFactGroup(&_terrainFactGroup, _terrainFactGroupName); // Add firmware-specific fact groups, if provided QMap* fwFactGroups = _firmwarePlugin->factGroups(); diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index d1d69c5..c47d9fc 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -1362,8 +1362,8 @@ private: static const char* _localPositionSetpointFactGroupName; static const char* _escStatusFactGroupName; static const char* _estimatorStatusFactGroupName; - static const char* _terrainFactGroupName; static const char* _hygrometerFactGroupName; + static const char* _terrainFactGroupName; static const int _vehicleUIUpdateRateMSecs = 100; diff --git a/src/Vehicle/VehicleHygrometerFactGroup.h b/src/Vehicle/VehicleHygrometerFactGroup.h index 2641b49..b5527e6 100644 --- a/src/Vehicle/VehicleHygrometerFactGroup.h +++ b/src/Vehicle/VehicleHygrometerFactGroup.h @@ -37,7 +37,7 @@ public: protected: void _handleHygrometerSensor (mavlink_message_t& message); - Fact _hygroIDFact; Fact _hygroTempFact; Fact _hygroHumiFact; + Fact _hygroIDFact; };