Browse Source

AP_BoardConfig: reducing indenting by linearizing the logic

mission-4.1.18
Eugene Shamaev 7 years ago committed by Tom Pittenger
parent
commit
857bd4f775
  1. 16
      libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp

16
libraries/AP_BoardConfig/AP_BoardConfig_CAN.cpp

@ -127,15 +127,20 @@ void AP_BoardConfig_CAN::setup_canbus(void) @@ -127,15 +127,20 @@ void AP_BoardConfig_CAN::setup_canbus(void)
if (initret) {
for (uint8_t i = 0; i < MAX_NUMBER_OF_CAN_DRIVERS; i++) {
if (hal.can_mgr[i] != nullptr) {
if (hal.can_mgr[i] == nullptr) {
continue;
}
hal.can_mgr[i]->initialized(true);
printf("can_mgr %d initialized well\n\r", i + 1);
if (_var_info_can_protocol[i]._protocol == UAVCAN_PROTOCOL_ENABLE) {
_var_info_can_protocol[i]._uavcan = new AP_UAVCAN;
if (_var_info_can_protocol[i]._uavcan != nullptr)
{
if (_var_info_can_protocol[i]._uavcan == nullptr) {
AP_HAL::panic("Failed to allocate uavcan %d\n\r", i + 1);
continue;
}
AP_Param::load_object_from_eeprom(_var_info_can_protocol[i]._uavcan, AP_UAVCAN::var_info);
hal.can_mgr[i]->set_UAVCAN(_var_info_can_protocol[i]._uavcan);
@ -146,11 +151,6 @@ void AP_BoardConfig_CAN::setup_canbus(void) @@ -146,11 +151,6 @@ void AP_BoardConfig_CAN::setup_canbus(void)
} else {
printf("Failed to initialize uavcan interface %d\n\r", i + 1);
}
} else {
AP_HAL::panic("Failed to allocate uavcan %d\n\r", i + 1);
}
}
}
}

Loading…
Cancel
Save