Browse Source

uavcan_v1: Publisher: Fix port_id update

master
JacobCrabill 4 years ago committed by Daniel Agar
parent
commit
74d0f46279
  1. 15
      src/drivers/uavcan_v1/Publishers/Publisher.hpp

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

@ -68,8 +68,6 @@ public: @@ -68,8 +68,6 @@ public:
// Update the uORB Subscription and broadcast a UAVCAN message
virtual void update() = 0;
bool isValidPortId(int32_t id) const { return id >= 0 && id <= CANARD_PORT_ID_MAX; }
CanardPortID id() { return _port_id; };
void updateParam()
@ -79,14 +77,9 @@ public: @@ -79,14 +77,9 @@ public:
// Set _port_id from _uavcan_param
uavcan_register_Value_1_0 value;
_param_manager.GetParamByName(uavcan_param, value);
uint16_t new_id = value.natural16.value.elements[0];
// Allow, for example, a default PX4 param value of '-1' to disable publication
if (!isValidPortId(new_id)) {
// but always use the standard 'unset' value for comparison
new_id = CANARD_PORT_ID_UNSET;
}
if (_param_manager.GetParamByName(uavcan_param, value)) {
uint16_t new_id = value.natural16.value.elements[0];
if (_port_id != new_id) {
if (new_id == CANARD_PORT_ID_UNSET) {
@ -98,12 +91,16 @@ public: @@ -98,12 +91,16 @@ public:
PX4_INFO("Enabling subject %s.%d on port %d", _subject_name, _instance, _port_id);
}
}
}
};
void printInfo()
{
if (_port_id != CANARD_PORT_ID_UNSET) {
PX4_INFO("Enabled subject %s.%d on port %d", _subject_name, _instance, _port_id);
} else {
PX4_INFO("Subject %s.%d disabled", _subject_name, _instance);
}
}

Loading…
Cancel
Save