Browse Source

AP_HAL_ChibiOS: fix CAN manager initialization

mission-4.1.18
Francisco Ferreira 7 years ago
parent
commit
e1bf89f32d
No known key found for this signature in database
GPG Key ID: F63C20A6773E787E
  1. 6
      libraries/AP_HAL_ChibiOS/CAN.cpp
  2. 1
      libraries/AP_HAL_ChibiOS/CAN.h

6
libraries/AP_HAL_ChibiOS/CAN.cpp

@ -43,11 +43,7 @@ uavcan::MonotonicTime clock::getMonotonic()
bool CANManager::begin(uint32_t bitrate, uint8_t can_number) bool CANManager::begin(uint32_t bitrate, uint8_t can_number)
{ {
if (can_helper.init(bitrate, CanIface::OperatingMode::NormalMode, can_number) == 0) { return (can_helper.init(bitrate, CanIface::OperatingMode::NormalMode, can_number) == 0);
bitrate_ = bitrate;
initialized_ = true;
}
return initialized_;
} }
bool CANManager::is_initialized() bool CANManager::is_initialized()

1
libraries/AP_HAL_ChibiOS/CAN.h

@ -74,7 +74,6 @@ public:
private: private:
AP_UAVCAN *p_uavcan; AP_UAVCAN *p_uavcan;
bool initialized_; bool initialized_;
uint32_t bitrate_;
uavcan_stm32::CanInitHelper<CAN_STM32_RX_QUEUE_SIZE> can_helper; uavcan_stm32::CanInitHelper<CAN_STM32_RX_QUEUE_SIZE> can_helper;
}; };

Loading…
Cancel
Save