Browse Source

uavcan_v1: Rename Publication --> Publisher

release/1.12
JacobCrabill 4 years ago committed by Lorenz Meier
parent
commit
c8e66a2f5c
  1. 4
      src/drivers/uavcan_v1/Actuators/EscClient.hpp
  2. 6
      src/drivers/uavcan_v1/Publishers/Gnss.hpp
  3. 4
      src/drivers/uavcan_v1/Publishers/Publisher.hpp
  4. 4
      src/drivers/uavcan_v1/Uavcan.hpp

4
src/drivers/uavcan_v1/Actuators/EscClient.hpp

@ -62,13 +62,13 @@
#include <reg/drone/service/common/Readiness_0_1.h> #include <reg/drone/service/common/Readiness_0_1.h>
/// TODO: Allow derived class of Subscription at same time, to handle ESC Feedback/Status /// TODO: Allow derived class of Subscription at same time, to handle ESC Feedback/Status
class UavcanEscController : public UavcanPublication class UavcanEscController : public UavcanPublisher
{ {
public: public:
static constexpr int MAX_ACTUATORS = MixingOutput::MAX_ACTUATORS; static constexpr int MAX_ACTUATORS = MixingOutput::MAX_ACTUATORS;
UavcanEscController(CanardInstance &ins, UavcanParamManager &pmgr, const char *uavcan_pname) : UavcanEscController(CanardInstance &ins, UavcanParamManager &pmgr, const char *uavcan_pname) :
UavcanPublication(ins, pmgr, uavcan_pname) { }; UavcanPublisher(ins, pmgr, uavcan_pname) { };
~UavcanEscController() {}; ~UavcanEscController() {};

6
src/drivers/uavcan_v1/Publishers/Gnss.hpp

@ -47,11 +47,11 @@
#include "Publisher.hpp" #include "Publisher.hpp"
class UavcanGnssPublication : public UavcanPublication class UavcanGnssPublisher : public UavcanPublisher
{ {
public: public:
UavcanGnssPublication(CanardInstance &ins, UavcanParamManager &pmgr, const char *uavcan_pname) : UavcanGnssPublisher(CanardInstance &ins, UavcanParamManager &pmgr, const char *uavcan_pname) :
UavcanPublication(ins, pmgr, uavcan_pname) UavcanPublisher(ins, pmgr, uavcan_pname)
{ {
}; };

4
src/drivers/uavcan_v1/Publishers/Publisher.hpp

@ -50,12 +50,12 @@
#include "../CanardInterface.hpp" #include "../CanardInterface.hpp"
#include "../ParamManager.hpp" #include "../ParamManager.hpp"
class UavcanPublication class UavcanPublisher
{ {
public: public:
static constexpr uint16_t CANARD_PORT_ID_UNSET = 65535U; static constexpr uint16_t CANARD_PORT_ID_UNSET = 65535U;
UavcanPublication(CanardInstance &ins, UavcanParamManager &pmgr, const char *uavcan_pname) : UavcanPublisher(CanardInstance &ins, UavcanParamManager &pmgr, const char *uavcan_pname) :
_canard_instance(ins), _param_manager(pmgr), _uavcan_param(uavcan_pname) { }; _canard_instance(ins), _param_manager(pmgr), _uavcan_param(uavcan_pname) { };
// Update the uORB Subscription and broadcast a UAVCAN message // Update the uORB Subscription and broadcast a UAVCAN message

4
src/drivers/uavcan_v1/Uavcan.hpp

@ -238,13 +238,13 @@ private:
UavcanParamManager _param_manager; UavcanParamManager _param_manager;
UavcanGnssPublication _gps_pub {_canard_instance, _param_manager, "uavcan.pub.gps.0.id"}; UavcanGnssPublisher _gps_pub {_canard_instance, _param_manager, "uavcan.pub.gps.0.id"};
UavcanEscController _esc_controller {_canard_instance, _param_manager, "uavcan.pub.esc.0.id"}; UavcanEscController _esc_controller {_canard_instance, _param_manager, "uavcan.pub.esc.0.id"};
// Publication objects: Any object used to bridge a uORB message to a UAVCAN message // Publication objects: Any object used to bridge a uORB message to a UAVCAN message
/// TODO: For some service implementations, it makes sense to have them be both Publishers and Subscribers /// TODO: For some service implementations, it makes sense to have them be both Publishers and Subscribers
UavcanPublication *_publishers[2] {&_gps_pub, &_esc_controller}; UavcanPublisher *_publishers[2] {&_gps_pub, &_esc_controller};
UavcanGnssSubscription _gps0_sub {_canard_instance, _param_manager, "uavcan.sub.gps.0.id"}; UavcanGnssSubscription _gps0_sub {_canard_instance, _param_manager, "uavcan.sub.gps.0.id"};
UavcanGnssSubscription _gps1_sub {_canard_instance, _param_manager, "uavcan.sub.gps.1.id"}; UavcanGnssSubscription _gps1_sub {_canard_instance, _param_manager, "uavcan.sub.gps.1.id"};

Loading…
Cancel
Save