Browse Source

AP_UAVCAN: continue dna server setup even if unique id not received

master
Siddharth Purohit 6 years ago committed by Andrew Tridgell
parent
commit
0976019133
  1. 3
      libraries/AP_UAVCAN/AP_UAVCAN.cpp

3
libraries/AP_UAVCAN/AP_UAVCAN.cpp

@ -186,7 +186,7 @@ void AP_UAVCAN::init(uint8_t driver_index)
if (hal.util->get_system_id_unformatted(unique_id, uid_len)) { if (hal.util->get_system_id_unformatted(unique_id, uid_len)) {
uavcan::copy(unique_id, unique_id + uid_len, hw_version.unique_id.begin()); uavcan::copy(unique_id, unique_id + uid_len, hw_version.unique_id.begin());
}
_node->setHardwareVersion(hw_version); _node->setHardwareVersion(hw_version);
int start_res = _node->start(); int start_res = _node->start();
@ -199,7 +199,6 @@ void AP_UAVCAN::init(uint8_t driver_index)
#ifdef HAS_UAVCAN_SERVERS #ifdef HAS_UAVCAN_SERVERS
_servers.init(*_node); _servers.init(*_node);
#endif #endif
}
// Roundup all subscribers from supported drivers // Roundup all subscribers from supported drivers
AP_GPS_UAVCAN::subscribe_msgs(this); AP_GPS_UAVCAN::subscribe_msgs(this);
AP_Compass_UAVCAN::subscribe_msgs(this); AP_Compass_UAVCAN::subscribe_msgs(this);

Loading…
Cancel
Save