From 4308958f66eeecfe5175261d0e8ae3a2c63f89f3 Mon Sep 17 00:00:00 2001 From: David Rebbe Date: Thu, 5 Dec 2024 13:07:42 -0500 Subject: [PATCH] more renaming --- .../icsneopy/communication/message/message.cpp | 18 +++++++++--------- communication/decoder.cpp | 4 ++-- communication/encoder.cpp | 6 +++--- .../callback/streamoutput/a2bwavoutput.cpp | 2 +- communication/message/neomessage.cpp | 4 ++-- communication/packet/canpacket.cpp | 6 +++--- device/device.cpp | 4 ++-- examples/cpp/a2b/src/a2b.cpp | 2 +- .../cpp/interactive/src/InteractiveExample.cpp | 8 ++++---- examples/cpp/lin/src/LINExample.cpp | 2 +- examples/cpp/mdio/src/MDIOExample.cpp | 2 +- examples/cpp/simple/src/SimpleExample.cpp | 2 +- examples/cpp/vsa/src/VSAExample.cpp | 4 ++-- .../message/filter/canmessagefilter.h | 4 ++-- .../message/filter/messagefilter.h | 4 ++-- .../communication/message/flashmemorymessage.h | 2 +- include/icsneo/communication/message/message.h | 12 ++++++------ .../message/neoreadmemorysdmessage.h | 2 +- 18 files changed, 44 insertions(+), 44 deletions(-) diff --git a/bindings/python/icsneopy/communication/message/message.cpp b/bindings/python/icsneopy/communication/message/message.cpp index 627a7e6..60ecabf 100644 --- a/bindings/python/icsneopy/communication/message/message.cpp +++ b/bindings/python/icsneopy/communication/message/message.cpp @@ -9,12 +9,12 @@ namespace icsneo { void init_message(pybind11::module_& m) { pybind11::class_> message(m, "Message"); pybind11::enum_(message, "Type") - .value("Frame", Message::Type::Frame) + .value("BusMessage", Message::Type::BusMessage) .value("CANErrorCount", Message::Type::CANErrorCount) .value("LINHeaderOnly", Message::Type::LINHeaderOnly) .value("LINBreak", Message::Type::LINBreak) .value("Invalid", Message::Type::Invalid) - .value("RawMessage", Message::Type::RawMessage) + .value("InternalMessage", Message::Type::InternalMessage) .value("ReadSettings", Message::Type::ReadSettings) .value("ResetStatus", Message::Type::ResetStatus) .value("DeviceVersion", Message::Type::DeviceVersion) @@ -37,14 +37,14 @@ void init_message(pybind11::module_& m) { message.def_readonly("type", &Message::type); message.def_readwrite("timestamp", &Message::timestamp); - pybind11::class_, Message>(m, "RawMessage") - .def_readwrite("network", &RawMessage::network) - .def_readwrite("data", &RawMessage::data); + pybind11::class_, Message>(m, "InternalMessage") + .def_readwrite("network", &InternalMessage::network) + .def_readwrite("data", &InternalMessage::data); - pybind11::class_, RawMessage>(m, "Frame") - .def_readwrite("description", &Frame::description) - .def_readwrite("transmitted", &Frame::transmitted) - .def_readwrite("error", &Frame::error); + pybind11::class_, InternalMessage>(m, "BusMessage") + .def_readwrite("description", &BusMessage::description) + .def_readwrite("transmitted", &BusMessage::transmitted) + .def_readwrite("error", &BusMessage::error); } } // namespace icsneo diff --git a/communication/decoder.cpp b/communication/decoder.cpp index eac0cc5..c5d2dbb 100644 --- a/communication/decoder.cpp +++ b/communication/decoder.cpp @@ -87,7 +87,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrtimestamp *= timestampResolution; switch(result->type) { - case Message::Type::Frame: { + case Message::Type::BusMessage: { CANMessage& can = *static_cast(result.get()); can.network = packet->network; break; @@ -308,7 +308,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata); return true; default: - // No defined handler, treat this as a RawMessage + // No defined handler, treat this as a InternalMessage break; } break; diff --git a/communication/encoder.cpp b/communication/encoder.cpp index 8918bb1..c453fee 100644 --- a/communication/encoder.cpp +++ b/communication/encoder.cpp @@ -23,10 +23,10 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, result.clear(); switch(message->type) { - case Message::Type::Frame: { + case Message::Type::BusMessage: { auto frame = std::dynamic_pointer_cast(message); - // Frame uses frame->data as the buffer unless directed otherwise + // BusMessage uses frame->data as the buffer unless directed otherwise buffer = &frame->data; netid = uint16_t(frame->network.getNetID()); @@ -130,7 +130,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, break; } - case Message::Type::RawMessage: { + case Message::Type::InternalMessage: { auto raw = std::dynamic_pointer_cast(message); // Raw message uses raw->data as the buffer unless directed otherwise diff --git a/communication/message/callback/streamoutput/a2bwavoutput.cpp b/communication/message/callback/streamoutput/a2bwavoutput.cpp index cc325d6..deb4e0a 100644 --- a/communication/message/callback/streamoutput/a2bwavoutput.cpp +++ b/communication/message/callback/streamoutput/a2bwavoutput.cpp @@ -102,7 +102,7 @@ bool A2BWAVOutput::callIfMatch(const std::shared_ptr& message) const { return false; } - if(message->type != Message::Type::Frame) { + if(message->type != Message::Type::BusMessage) { return false; } diff --git a/communication/message/neomessage.cpp b/communication/message/neomessage.cpp index 7818ea1..2463732 100644 --- a/communication/message/neomessage.cpp +++ b/communication/message/neomessage.cpp @@ -14,7 +14,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr message) { neomsg.timestamp = message->timestamp; switch (message->type) { - case Message::Type::Frame: { + case Message::Type::BusMessage: { neomessage_frame_t& frame = *(neomessage_frame_t*)&neomsg; auto framemsg = std::static_pointer_cast(message); const auto netType = framemsg->network.getType(); @@ -120,7 +120,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr message) { std::shared_ptr icsneo::CreateMessageFromNeoMessage(const neomessage_t* neomessage) { switch((Message::Type)neomessage->messageType) { - case Message::Type::Frame: { + case Message::Type::BusMessage: { const Network network = ((neomessage_frame_t*)neomessage)->netid; switch(network.getType()) { case icsneo_msg_bus_type_can: diff --git a/communication/packet/canpacket.cpp b/communication/packet/canpacket.cpp index ed3c753..f92181f 100644 --- a/communication/packet/canpacket.cpp +++ b/communication/packet/canpacket.cpp @@ -69,7 +69,7 @@ std::shared_ptr HardwareCANPacket::DecodeToMessage(const std::vector(); // Arb ID @@ -104,7 +104,7 @@ std::shared_ptr HardwareCANPacket::DecodeToMessage(const std::vectordlc.RTR && data->header.IDE) || (!data->header.IDE && data->header.SRR)) { // Remote Request Frame + if((data->dlc.RTR && data->header.IDE) || (!data->header.IDE && data->header.SRR)) { // Remote Request BusMessage msg->data.resize(length); // This data will be all zeros, but the length will be set msg->isRemote = true; } else { @@ -197,7 +197,7 @@ bool HardwareCANPacket::EncodeFromMessage(const CANMessage& message, std::vector // Status and DLC bits if(message.isCANFD) { - result.push_back(0x0F); // FD Frame + result.push_back(0x0F); // FD BusMessage uint8_t fdStatusByte = *dlc; if(message.baudrateSwitch) fdStatusByte |= 0x80; // BRS status bit diff --git a/device/device.cpp b/device/device.cpp index 80174cb..b68f565 100644 --- a/device/device.cpp +++ b/device/device.cpp @@ -1718,11 +1718,11 @@ void Device::handleInternalMessage(std::shared_ptr message) { case Message::Type::ResetStatus: latestResetStatus = std::static_pointer_cast(message); break; - case Message::Type::RawMessage: { + case Message::Type::InternalMessage: { auto rawMessage = std::static_pointer_cast(message); switch(rawMessage->network.getNetID()) { case Network::NetID::Device: { - // Device is not guaranteed to be a CANMessage, it might be a RawMessage + // Device is not guaranteed to be a CANMessage, it might be a InternalMessage // if it couldn't be decoded to a CANMessage. We only care about the // CANMessage decoding right now. auto canmsg = std::dynamic_pointer_cast(message); diff --git a/examples/cpp/a2b/src/a2b.cpp b/examples/cpp/a2b/src/a2b.cpp index 2273b72..51211f1 100644 --- a/examples/cpp/a2b/src/a2b.cpp +++ b/examples/cpp/a2b/src/a2b.cpp @@ -259,7 +259,7 @@ void example4(const std::shared_ptr& rada2b) { auto handler = rada2b->addMessageCallback(std::make_shared( [] (std::shared_ptr newMsg) { - if(newMsg->type == icsneo::Message::Type::Frame) { + if(newMsg->type == icsneo::Message::Type::BusMessage) { const auto& frame = std::dynamic_pointer_cast(newMsg); if(frame && frame->network.getNetID() == icsneo::Network::NetID::I2C2) { const auto& i2cMessage = std::dynamic_pointer_cast(frame); diff --git a/examples/cpp/interactive/src/InteractiveExample.cpp b/examples/cpp/interactive/src/InteractiveExample.cpp index f8d13e8..ebbf9c7 100644 --- a/examples/cpp/interactive/src/InteractiveExample.cpp +++ b/examples/cpp/interactive/src/InteractiveExample.cpp @@ -184,8 +184,8 @@ std::shared_ptr selectDevice(const std::vector& message) { switch(message->type) { - case icsneo::Message::Type::Frame: { - // A message of type Frame is guaranteed to be a Frame, so we can static cast safely + case icsneo::Message::Type::BusMessage: { + // A message of type BusMessage is guaranteed to be a BusMessage, so we can static cast safely auto frame = std::static_pointer_cast(message); switch(frame->network.getType()) { case icsneo_msg_bus_type_can: { @@ -217,7 +217,7 @@ void printMessage(const std::shared_ptr& message) { case icsneo_msg_bus_type_ethernet: { auto ethMessage = std::static_pointer_cast(message); - std::cout << "\t\t" << ethMessage->network << " Frame - " << std::dec + std::cout << "\t\t" << ethMessage->network << " BusMessage - " << std::dec << ethMessage->data.size() << " bytes on wire\n"; std::cout << "\t\t Timestamped:\t"<< ethMessage->timestamp << " ns since 1/1/2007\n"; @@ -264,7 +264,7 @@ void printMessage(const std::shared_ptr& message) { break; } break; - } // end of icsneo::Message::Type::Frame + } // end of icsneo::Message::Type::BusMessage case icsneo::Message::Type::CANErrorCount: { // A message of type CANErrorCount is guaranteed to be a CANErrorCount, so we can static cast safely auto cec = std::static_pointer_cast(message); diff --git a/examples/cpp/lin/src/LINExample.cpp b/examples/cpp/lin/src/LINExample.cpp index f8f3a6f..aa64e30 100644 --- a/examples/cpp/lin/src/LINExample.cpp +++ b/examples/cpp/lin/src/LINExample.cpp @@ -96,7 +96,7 @@ int main() { std::cout << "OK" << std::endl << std::endl; auto handler = device->addMessageCallback(std::make_shared([&](std::shared_ptr message) { - if(icsneo::Message::Type::Frame == message->type) { + if(icsneo::Message::Type::BusMessage == message->type) { auto frame = std::static_pointer_cast(message); if(icsneo_msg_bus_type_lin == frame->network.getType()) { auto msg = std::static_pointer_cast(message); diff --git a/examples/cpp/mdio/src/MDIOExample.cpp b/examples/cpp/mdio/src/MDIOExample.cpp index 97ba03d..7ff5937 100644 --- a/examples/cpp/mdio/src/MDIOExample.cpp +++ b/examples/cpp/mdio/src/MDIOExample.cpp @@ -92,7 +92,7 @@ int main() auto handler = device->addMessageCallback(std::make_shared([&](std::shared_ptr message) { - if(icsneo::Message::Type::Frame == message->type) { + if(icsneo::Message::Type::BusMessage == message->type) { auto frame = std::static_pointer_cast(message); if(icsneo_msg_bus_type_mdio == frame->network.getType()) { auto msg = std::static_pointer_cast(message); diff --git a/examples/cpp/simple/src/SimpleExample.cpp b/examples/cpp/simple/src/SimpleExample.cpp index c8d6086..1858154 100644 --- a/examples/cpp/simple/src/SimpleExample.cpp +++ b/examples/cpp/simple/src/SimpleExample.cpp @@ -169,7 +169,7 @@ int main() { // MessageCallbacks are powerful, and can filter on things like ArbID for you. See the documentation auto handler = device->addMessageCallback(std::make_shared([](std::shared_ptr message) { switch(message->type) { - case icsneo::Message::Type::Frame: { + case icsneo::Message::Type::BusMessage: { // A message of type Frame is guaranteed to be a Frame, so we can static cast safely auto frame = std::static_pointer_cast(message); switch(frame->network.getType()) { diff --git a/examples/cpp/vsa/src/VSAExample.cpp b/examples/cpp/vsa/src/VSAExample.cpp index 8e18e37..481c2d5 100644 --- a/examples/cpp/vsa/src/VSAExample.cpp +++ b/examples/cpp/vsa/src/VSAExample.cpp @@ -166,7 +166,7 @@ int main(int argc, char* argv[]) { uint64_t canFrameCount = 0; uint64_t ethFrameCount = 0; rxDevice->addMessageCallback(std::make_shared([&](std::shared_ptr msg) { - if(msg->type != icsneo::Message::Type::Frame) { + if(msg->type != icsneo::Message::Type::BusMessage) { return; } const auto frame = std::static_pointer_cast(msg); @@ -216,7 +216,7 @@ int main(int argc, char* argv[]) { size_t currentMessage = 0; rxDevice->addMessageCallback(std::make_shared([&](std::shared_ptr msg) { - if(msg->type != icsneo::Message::Type::Frame) { + if(msg->type != icsneo::Message::Type::BusMessage) { return; } auto frame = std::static_pointer_cast(msg); diff --git a/include/icsneo/communication/message/filter/canmessagefilter.h b/include/icsneo/communication/message/filter/canmessagefilter.h index edbb89e..38d4ff8 100644 --- a/include/icsneo/communication/message/filter/canmessagefilter.h +++ b/include/icsneo/communication/message/filter/canmessagefilter.h @@ -13,8 +13,8 @@ namespace icsneo { class CANMessageFilter : public MessageFilter { public: - CANMessageFilter() : MessageFilter(icsneo_msg_bus_type_can), arbid(INVALID_ARBID) { messageType = Message::Type::Frame; } - CANMessageFilter(uint32_t arbid) : MessageFilter(icsneo_msg_bus_type_can), arbid(arbid) { messageType = Message::Type::Frame; } + CANMessageFilter() : MessageFilter(icsneo_msg_bus_type_can), arbid(INVALID_ARBID) { messageType = Message::Type::BusMessage; } + CANMessageFilter(uint32_t arbid) : MessageFilter(icsneo_msg_bus_type_can), arbid(arbid) { messageType = Message::Type::BusMessage; } bool match(const std::shared_ptr& message) const { if(!MessageFilter::match(message)) diff --git a/include/icsneo/communication/message/filter/messagefilter.h b/include/icsneo/communication/message/filter/messagefilter.h index 530ca8e..61e6322 100644 --- a/include/icsneo/communication/message/filter/messagefilter.h +++ b/include/icsneo/communication/message/filter/messagefilter.h @@ -27,8 +27,8 @@ public: if(!matchMessageType(message->type)) return false; - if(message->type == Message::Type::Frame || message->type == Message::Type::Main51 || - message->type == Message::Type::RawMessage || message->type == Message::Type::ReadSettings) { + if(message->type == Message::Type::BusMessage || message->type == Message::Type::Main51 || + message->type == Message::Type::InternalMessage || message->type == Message::Type::ReadSettings) { const auto frame = std::static_pointer_cast(message); if(!matchNetworkType(frame->network.getType())) return false; diff --git a/include/icsneo/communication/message/flashmemorymessage.h b/include/icsneo/communication/message/flashmemorymessage.h index 97200b3..175345f 100644 --- a/include/icsneo/communication/message/flashmemorymessage.h +++ b/include/icsneo/communication/message/flashmemorymessage.h @@ -9,7 +9,7 @@ namespace icsneo { class FlashMemoryMessage : public InternalMessage { public: - FlashMemoryMessage() : InternalMessage(Message::Type::RawMessage, Network::NetID::RED_INT_MEMORYREAD) {} + FlashMemoryMessage() : InternalMessage(Message::Type::InternalMessage, Network::NetID::RED_INT_MEMORYREAD) {} uint16_t startAddress = 0; }; diff --git a/include/icsneo/communication/message/message.h b/include/icsneo/communication/message/message.h index 2123a42..bbdc01a 100644 --- a/include/icsneo/communication/message/message.h +++ b/include/icsneo/communication/message/message.h @@ -22,7 +22,7 @@ public: virtual const icsneo_msg_type_t getMsgType() const { return icsneo_msg_type_device; } enum class Type : neomessagetype_t { - Frame = 0, + BusMessage = 0, CANErrorCount = 0x100, @@ -31,7 +31,7 @@ public: // Past 0x8000 are all for internal use only Invalid = 0x8000, - RawMessage = 0x8001, + InternalMessage = 0x8001, ReadSettings = 0x8002, ResetStatus = 0x8003, DeviceVersion = 0x8004, @@ -59,10 +59,10 @@ public: class InternalMessage : public Message { public: - InternalMessage(Message::Type type = Message::Type::RawMessage) : Message(type) {} + InternalMessage(Message::Type type = Message::Type::InternalMessage) : Message(type) {} InternalMessage(Message::Type type, Network net) : Message(type), network(net) {} - InternalMessage(Network net) : Message(Message::Type::RawMessage), network(net) {} - InternalMessage(Network net, std::vector d) : Message(Message::Type::RawMessage), network(net), data(d) {} + InternalMessage(Network net) : Message(Message::Type::InternalMessage), network(net) {} + InternalMessage(Network net, std::vector d) : Message(Message::Type::InternalMessage), network(net), data(d) {} virtual const icsneo_msg_type_t getMsgType() const { return icsneo_msg_type_internal; } @@ -72,7 +72,7 @@ public: class BusMessage : public InternalMessage { public: - BusMessage() : InternalMessage(Message::Type::Frame) {} + BusMessage() : InternalMessage(Message::Type::BusMessage) {} const icsneo_msg_type_t getMsgType() const final { return icsneo_msg_type_bus; } diff --git a/include/icsneo/communication/message/neoreadmemorysdmessage.h b/include/icsneo/communication/message/neoreadmemorysdmessage.h index 1410946..008069f 100644 --- a/include/icsneo/communication/message/neoreadmemorysdmessage.h +++ b/include/icsneo/communication/message/neoreadmemorysdmessage.h @@ -9,7 +9,7 @@ namespace icsneo { class NeoReadMemorySDMessage : public InternalMessage { public: - NeoReadMemorySDMessage() : InternalMessage(Message::Type::RawMessage, Network::NetID::NeoMemorySDRead) {} + NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::NetID::NeoMemorySDRead) {} uint32_t startAddress = 0; };