diff --git a/libraries/Arduino_CAN/src/CanUtil.cpp b/libraries/Arduino_CAN/src/CanUtil.cpp index d3250ae48..9861e15e8 100644 --- a/libraries/Arduino_CAN/src/CanUtil.cpp +++ b/libraries/Arduino_CAN/src/CanUtil.cpp @@ -28,7 +28,7 @@ namespace util **************************************************************************************/ std::tuple - calc_can_bit_timing(CanBitRate const can_bitrate, + calc_can_bit_timing(uint32_t const can_bitrate, uint32_t const can_clock_Hz, uint32_t const tq_min, uint32_t const tq_max, diff --git a/libraries/Arduino_CAN/src/CanUtil.h b/libraries/Arduino_CAN/src/CanUtil.h index ec5a89ae5..ae1a488a1 100644 --- a/libraries/Arduino_CAN/src/CanUtil.h +++ b/libraries/Arduino_CAN/src/CanUtil.h @@ -36,7 +36,7 @@ std::tuple /* time_segment_2 */ -calc_can_bit_timing(CanBitRate const can_bitrate, uint32_t const can_clock_Hz, uint32_t const tq_min, uint32_t const tq_max, +calc_can_bit_timing(uint32_t const can_bitrate, uint32_t const can_clock_Hz, uint32_t const tq_min, uint32_t const tq_max, uint32_t const tseg1_min, uint32_t const tseg1_max, uint32_t const tseg2_min, uint32_t const tseg2_max); /************************************************************************************** diff --git a/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp b/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp index 95938e80e..c53f44942 100644 --- a/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp +++ b/libraries/Arduino_CAN/src/R7FA4M1_CAN.cpp @@ -137,6 +137,11 @@ R7FA4M1_CAN::R7FA4M1_CAN(int const can_tx_pin, int const can_rx_pin) **************************************************************************************/ bool R7FA4M1_CAN::begin(CanBitRate const can_bitrate) +{ + return begin(static_cast(can_bitrate)); +} + +bool R7FA4M1_CAN::begin(uint32_t const can_bitrate) { bool init_ok = true; diff --git a/libraries/Arduino_CAN/src/R7FA4M1_CAN.h b/libraries/Arduino_CAN/src/R7FA4M1_CAN.h index f60252f61..235df871f 100644 --- a/libraries/Arduino_CAN/src/R7FA4M1_CAN.h +++ b/libraries/Arduino_CAN/src/R7FA4M1_CAN.h @@ -52,6 +52,7 @@ class R7FA4M1_CAN final : public HardwareCAN bool begin(CanBitRate const can_bitrate) override; + bool begin(uint32_t const can_bitrate); void end() override; void setFilterMask_Standard(uint32_t const mask);