diff --git a/src/system/can_bus.cpp b/src/system/can_bus.cpp index 7d7b1c6..a382eec 100644 --- a/src/system/can_bus.cpp +++ b/src/system/can_bus.cpp @@ -8,7 +8,6 @@ #include #include -#include #include #include #include @@ -138,74 +137,6 @@ namespace dummy namespace sta { - class AlpakaCanBus - { - public: - using SysMsgHandler = void (*)(const CanRxHeader &, const uint8_t *); - using DataMsgHandler = void (*)(const IsotpMessage &); - - static const uint8_t FIFO_SYS = 0; - static const uint8_t FIFO_DATA = 1; - - public: - AlpakaCanBus(CanController * controller, TimeMsFn timeMs, SysMsgHandler sysMsgHandler, DataMsgHandler dataMsgHandler); - - - /** - * @brief Send system message. - * - * @param msg Message - */ - void send(const CanSysMsg & msg); - - /** - * @brief Send data message. - * - * @param msg Message - */ - void send(const CanDataMsg & msg); - - - /** - * @brief Process transmissions. - * - * Call regularly to advance transmission. - */ - void processTx(); - - /** - * @brief Process received CAN messages. - */ - void processRx(); - - /** - * @brief Display ISOTP TX/RX statistics. - */ - void showStatistics(); - - private: - /** - * @brief Configure CAN filters. - */ - void setupSubscriptions(); - - /** - * @brief Handle received data message CAN frames. - * - * @param header CAN frame header - * @param payload Payload buffer - */ - void receiveDataFrame(const CanRxHeader & header, const uint8_t * payload); - - private: - CanController * controller_; - IsotpTransmitter tx_; - IsotpReceiver rx_; - SysMsgHandler handleSysMsg_; - DataMsgHandler handleDataMsg_; - }; - - AlpakaCanBus::AlpakaCanBus(CanController * controller, TimeMsFn timeMs, SysMsgHandler sysMsgHandler, DataMsgHandler dataMsgHandler) : controller_{controller}, tx_{controller, timeMs}, rx_{controller, timeMs}, handleSysMsg_{sysMsgHandler}, handleDataMsg_{dataMsgHandler} {