Browse Source

Remote ID: implement in vehicle

QGC4.4
davidsastresas 2 years ago committed by David Sastre
parent
commit
63ead31728
  1. 5
      src/Vehicle/Vehicle.cc
  2. 4
      src/Vehicle/Vehicle.h

5
src/Vehicle/Vehicle.cc

@ -55,6 +55,7 @@
#include "MockLink.h" #include "MockLink.h"
#endif #endif
#include "Autotune.h" #include "Autotune.h"
#include "RemoteIDManager.h"
#if defined(QGC_AIRMAP_ENABLED) #if defined(QGC_AIRMAP_ENABLED)
#include "AirspaceVehicleManager.h" #include "AirspaceVehicleManager.h"
@ -405,6 +406,9 @@ void Vehicle::_commonInit()
connect(_rallyPointManager, &RallyPointManager::error, this, &Vehicle::_rallyPointManagerError); connect(_rallyPointManager, &RallyPointManager::error, this, &Vehicle::_rallyPointManagerError);
connect(_rallyPointManager, &RallyPointManager::loadComplete, this, &Vehicle::_firstRallyPointLoadComplete); connect(_rallyPointManager, &RallyPointManager::loadComplete, this, &Vehicle::_firstRallyPointLoadComplete);
// Remote ID manager might want to acces parameters so make sure to create it after
_remoteIDManager = new RemoteIDManager(this);
// Flight modes can differ based on advanced mode // Flight modes can differ based on advanced mode
connect(_toolbox->corePlugin(), &QGCCorePlugin::showAdvancedUIChanged, this, &Vehicle::flightModesChanged); connect(_toolbox->corePlugin(), &QGCCorePlugin::showAdvancedUIChanged, this, &Vehicle::flightModesChanged);
@ -657,6 +661,7 @@ void Vehicle::_mavlinkMessageReceived(LinkInterface* link, mavlink_message_t mes
_ftpManager->_mavlinkMessageReceived(message); _ftpManager->_mavlinkMessageReceived(message);
_parameterManager->mavlinkMessageReceived(message); _parameterManager->mavlinkMessageReceived(message);
_imageProtocolManager->mavlinkMessageReceived(message); _imageProtocolManager->mavlinkMessageReceived(message);
_remoteIDManager->mavlinkMessageReceived(message);
_waitForMavlinkMessageMessageReceived(message); _waitForMavlinkMessageMessageReceived(message);

4
src/Vehicle/Vehicle.h

@ -73,6 +73,7 @@ class LinkInterface;
class LinkManager; class LinkManager;
class InitialConnectStateMachine; class InitialConnectStateMachine;
class Autotune; class Autotune;
class RemoteIDManager;
#if defined(QGC_AIRMAP_ENABLED) #if defined(QGC_AIRMAP_ENABLED)
class AirspaceVehicleManager; class AirspaceVehicleManager;
@ -279,6 +280,7 @@ public:
Q_PROPERTY(VehicleLinkManager* vehicleLinkManager READ vehicleLinkManager CONSTANT) Q_PROPERTY(VehicleLinkManager* vehicleLinkManager READ vehicleLinkManager CONSTANT)
Q_PROPERTY(VehicleObjectAvoidance* objectAvoidance READ objectAvoidance CONSTANT) Q_PROPERTY(VehicleObjectAvoidance* objectAvoidance READ objectAvoidance CONSTANT)
Q_PROPERTY(Autotune* autotune READ autotune CONSTANT) Q_PROPERTY(Autotune* autotune READ autotune CONSTANT)
Q_PROPERTY(RemoteIDManager* remoteIDManager READ remoteIDManager CONSTANT)
// FactGroup object model properties // FactGroup object model properties
@ -708,6 +710,7 @@ public:
ComponentInformationManager* compInfoManager () { return _componentInformationManager; } ComponentInformationManager* compInfoManager () { return _componentInformationManager; }
VehicleObjectAvoidance* objectAvoidance () { return _objectAvoidance; } VehicleObjectAvoidance* objectAvoidance () { return _objectAvoidance; }
Autotune* autotune () const { return _autotune; } Autotune* autotune () const { return _autotune; }
RemoteIDManager* remoteIDManager () { return _remoteIDManager; }
static const int cMaxRcChannels = 18; static const int cMaxRcChannels = 18;
@ -1383,6 +1386,7 @@ private:
ImageProtocolManager* _imageProtocolManager = nullptr; ImageProtocolManager* _imageProtocolManager = nullptr;
InitialConnectStateMachine* _initialConnectStateMachine = nullptr; InitialConnectStateMachine* _initialConnectStateMachine = nullptr;
Actuators* _actuators = nullptr; Actuators* _actuators = nullptr;
RemoteIDManager* _remoteIDManager = nullptr;
static const char* _rollFactName; static const char* _rollFactName;
static const char* _pitchFactName; static const char* _pitchFactName;

Loading…
Cancel
Save