sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more renaming

David Rebbe 2024-12-05 13:07:42 -05:00
parent d3c7a92f57
commit 4308958f66
18 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bindings/python/icsneopy/communication/message/message.cpp
View File

@ -9,12 +9,12 @@ namespace icsneo {
void init_message(pybind11::module_& m) { void init_message(pybind11::module_& m) {
pybind11::class_<Message, std::shared_ptr<Message>> message(m, "Message"); pybind11::class_<Message, std::shared_ptr<Message>> message(m, "Message");
pybind11::enum_<Message::Type>(message, "Type") pybind11::enum_<Message::Type>(message, "Type")
.value("Frame", Message::Type::Frame) .value("BusMessage", Message::Type::BusMessage)
.value("CANErrorCount", Message::Type::CANErrorCount) .value("CANErrorCount", Message::Type::CANErrorCount)
.value("LINHeaderOnly", Message::Type::LINHeaderOnly) .value("LINHeaderOnly", Message::Type::LINHeaderOnly)
.value("LINBreak", Message::Type::LINBreak) .value("LINBreak", Message::Type::LINBreak)
.value("Invalid", Message::Type::Invalid) .value("Invalid", Message::Type::Invalid)
.value("RawMessage", Message::Type::RawMessage) .value("InternalMessage", Message::Type::InternalMessage)
.value("ReadSettings", Message::Type::ReadSettings) .value("ReadSettings", Message::Type::ReadSettings)
.value("ResetStatus", Message::Type::ResetStatus) .value("ResetStatus", Message::Type::ResetStatus)
.value("DeviceVersion", Message::Type::DeviceVersion) .value("DeviceVersion", Message::Type::DeviceVersion)
@ -37,14 +37,14 @@ void init_message(pybind11::module_& m) {
message.def_readonly("type", &Message::type); message.def_readonly("type", &Message::type);
message.def_readwrite("timestamp", &Message::timestamp); message.def_readwrite("timestamp", &Message::timestamp);
pybind11::class_<RawMessage, std::shared_ptr<RawMessage>, Message>(m, "RawMessage") pybind11::class_<InternalMessage, std::shared_ptr<InternalMessage>, Message>(m, "InternalMessage")
.def_readwrite("network", &RawMessage::network) .def_readwrite("network", &InternalMessage::network)
.def_readwrite("data", &RawMessage::data); .def_readwrite("data", &InternalMessage::data);
pybind11::class_<Frame, std::shared_ptr<Frame>, RawMessage>(m, "Frame") pybind11::class_<Frame, std::shared_ptr<Frame>, InternalMessage>(m, "BusMessage")
.def_readwrite("description", &Frame::description) .def_readwrite("description", &BusMessage::description)
.def_readwrite("transmitted", &Frame::transmitted) .def_readwrite("transmitted", &BusMessage::transmitted)
.def_readwrite("error", &Frame::error); .def_readwrite("error", &BusMessage::error);
} }
} // namespace icsneo } // namespace icsneo

4
communication/decoder.cpp
View File

@ -87,7 +87,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
result->timestamp *= timestampResolution; result->timestamp *= timestampResolution;
switch(result->type) { switch(result->type) {
case Message::Type::Frame: { case Message::Type::BusMessage: {
CANMessage& can = *static_cast<CANMessage*>(result.get()); CANMessage& can = *static_cast<CANMessage*>(result.get());
can.network = packet->network; can.network = packet->network;
break; break;
@ -308,7 +308,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
result = TC10StatusMessage::DecodeToMessage(packet->data); result = TC10StatusMessage::DecodeToMessage(packet->data);
return true; return true;
default: default:
// No defined handler, treat this as a RawMessage // No defined handler, treat this as a InternalMessage
break; break;
} }
break; break;

6
communication/encoder.cpp
View File

@ -23,10 +23,10 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
result.clear(); result.clear();
switch(message->type) { switch(message->type) {
case Message::Type::Frame: { case Message::Type::BusMessage: {
auto frame = std::dynamic_pointer_cast<BusMessage>(message); auto frame = std::dynamic_pointer_cast<BusMessage>(message);
// Frame uses frame->data as the buffer unless directed otherwise // BusMessage uses frame->data as the buffer unless directed otherwise
buffer = &frame->data; buffer = &frame->data;
netid = uint16_t(frame->network.getNetID()); netid = uint16_t(frame->network.getNetID());
@ -130,7 +130,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
break; break;
} }
case Message::Type::RawMessage: { case Message::Type::InternalMessage: {
auto raw = std::dynamic_pointer_cast<InternalMessage>(message); auto raw = std::dynamic_pointer_cast<InternalMessage>(message);
// Raw message uses raw->data as the buffer unless directed otherwise // Raw message uses raw->data as the buffer unless directed otherwise

2
communication/message/callback/streamoutput/a2bwavoutput.cpp
View File

@ -102,7 +102,7 @@ bool A2BWAVOutput::callIfMatch(const std::shared_ptr<Message>& message) const {
return false; return false;
} }
if(message->type != Message::Type::Frame) { if(message->type != Message::Type::BusMessage) {
return false; return false;
} }

4
communication/message/neomessage.cpp
View File

@ -14,7 +14,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr<Message> message) {
neomsg.timestamp = message->timestamp; neomsg.timestamp = message->timestamp;
switch (message->type) switch (message->type)
{ {
case Message::Type::Frame: { case Message::Type::BusMessage: {
neomessage_frame_t& frame = *(neomessage_frame_t*)&neomsg; neomessage_frame_t& frame = *(neomessage_frame_t*)&neomsg;
auto framemsg = std::static_pointer_cast<BusMessage>(message); auto framemsg = std::static_pointer_cast<BusMessage>(message);
const auto netType = framemsg->network.getType(); const auto netType = framemsg->network.getType();
@ -120,7 +120,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr<Message> message) {
std::shared_ptr<Message> icsneo::CreateMessageFromNeoMessage(const neomessage_t* neomessage) { std::shared_ptr<Message> icsneo::CreateMessageFromNeoMessage(const neomessage_t* neomessage) {
switch((Message::Type)neomessage->messageType) { switch((Message::Type)neomessage->messageType) {
case Message::Type::Frame: { case Message::Type::BusMessage: {
const Network network = ((neomessage_frame_t*)neomessage)->netid; const Network network = ((neomessage_frame_t*)neomessage)->netid;
switch(network.getType()) { switch(network.getType()) {
case icsneo_msg_bus_type_can: case icsneo_msg_bus_type_can:

6
communication/packet/canpacket.cpp
View File

@ -69,7 +69,7 @@ std::shared_ptr<Message> HardwareCANPacket::DecodeToMessage(const std::vector<ui
return msg; return msg;
} else { // CAN Frame } else { // CAN BusMessage
auto msg = std::make_shared<CANMessage>(); auto msg = std::make_shared<CANMessage>();
// Arb ID // Arb ID
@ -104,7 +104,7 @@ std::shared_ptr<Message> HardwareCANPacket::DecodeToMessage(const std::vector<ui
// Data // Data
// The first 8 bytes are always in the standard place // The first 8 bytes are always in the standard place
if((data->dlc.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->data.resize(length); // This data will be all zeros, but the length will be set
msg->isRemote = true; msg->isRemote = true;
} else { } else {
@ -197,7 +197,7 @@ bool HardwareCANPacket::EncodeFromMessage(const CANMessage& message, std::vector
// Status and DLC bits // Status and DLC bits
if(message.isCANFD) { if(message.isCANFD) {
result.push_back(0x0F); // FD Frame result.push_back(0x0F); // FD BusMessage
uint8_t fdStatusByte = *dlc; uint8_t fdStatusByte = *dlc;
if(message.baudrateSwitch) if(message.baudrateSwitch)
fdStatusByte |= 0x80; // BRS status bit fdStatusByte |= 0x80; // BRS status bit

4
device/device.cpp
View File

@ -1718,11 +1718,11 @@ void Device::handleInternalMessage(std::shared_ptr<Message> message) {
case Message::Type::ResetStatus: case Message::Type::ResetStatus:
latestResetStatus = std::static_pointer_cast<ResetStatusMessage>(message); latestResetStatus = std::static_pointer_cast<ResetStatusMessage>(message);
break; break;
case Message::Type::RawMessage: { case Message::Type::InternalMessage: {
auto rawMessage = std::static_pointer_cast<InternalMessage>(message); auto rawMessage = std::static_pointer_cast<InternalMessage>(message);
switch(rawMessage->network.getNetID()) { switch(rawMessage->network.getNetID()) {
case Network::NetID::Device: { 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 // if it couldn't be decoded to a CANMessage. We only care about the
// CANMessage decoding right now. // CANMessage decoding right now.
auto canmsg = std::dynamic_pointer_cast<CANMessage>(message); auto canmsg = std::dynamic_pointer_cast<CANMessage>(message);

2
examples/cpp/a2b/src/a2b.cpp
View File

@ -259,7 +259,7 @@ void example4(const std::shared_ptr<icsneo::Device>& rada2b) {
auto handler = rada2b->addMessageCallback(std::make_shared<icsneo::MessageCallback>( auto handler = rada2b->addMessageCallback(std::make_shared<icsneo::MessageCallback>(
[] (std::shared_ptr<icsneo::Message> newMsg) { [] (std::shared_ptr<icsneo::Message> newMsg) {
if(newMsg->type == icsneo::Message::Type::Frame) { if(newMsg->type == icsneo::Message::Type::BusMessage) {
const auto& frame = std::dynamic_pointer_cast<icsneo::BusMessage>(newMsg); const auto& frame = std::dynamic_pointer_cast<icsneo::BusMessage>(newMsg);
if(frame && frame->network.getNetID() == icsneo::Network::NetID::I2C2) { if(frame && frame->network.getNetID() == icsneo::Network::NetID::I2C2) {
const auto& i2cMessage = std::dynamic_pointer_cast<icsneo::I2CMessage>(frame); const auto& i2cMessage = std::dynamic_pointer_cast<icsneo::I2CMessage>(frame);

8
examples/cpp/interactive/src/InteractiveExample.cpp
View File

@ -184,8 +184,8 @@ std::shared_ptr<icsneo::Device> selectDevice(const std::vector<std::shared_ptr<i
void printMessage(const std::shared_ptr<icsneo::Message>& message) { void printMessage(const std::shared_ptr<icsneo::Message>& message) {
switch(message->type) { 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 // A message of type BusMessage is guaranteed to be a BusMessage, so we can static cast safely
auto frame = std::static_pointer_cast<icsneo::BusMessage>(message); auto frame = std::static_pointer_cast<icsneo::BusMessage>(message);
switch(frame->network.getType()) { switch(frame->network.getType()) {
case icsneo_msg_bus_type_can: { case icsneo_msg_bus_type_can: {
@ -217,7 +217,7 @@ void printMessage(const std::shared_ptr<icsneo::Message>& message) {
case icsneo_msg_bus_type_ethernet: { case icsneo_msg_bus_type_ethernet: {
auto ethMessage = std::static_pointer_cast<icsneo::EthernetMessage>(message); auto ethMessage = std::static_pointer_cast<icsneo::EthernetMessage>(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"; << ethMessage->data.size() << " bytes on wire\n";
std::cout << "\t\t Timestamped:\t"<< ethMessage->timestamp << " ns since 1/1/2007\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<icsneo::Message>& message) {
break; break;
} }
break; break;
} // end of icsneo::Message::Type::Frame } // end of icsneo::Message::Type::BusMessage
case icsneo::Message::Type::CANErrorCount: { case icsneo::Message::Type::CANErrorCount: {
// A message of type CANErrorCount is guaranteed to be a CANErrorCount, so we can static cast safely // A message of type CANErrorCount is guaranteed to be a CANErrorCount, so we can static cast safely
auto cec = std::static_pointer_cast<icsneo::CANErrorCountMessage>(message); auto cec = std::static_pointer_cast<icsneo::CANErrorCountMessage>(message);

2
examples/cpp/lin/src/LINExample.cpp
View File

@ -96,7 +96,7 @@ int main() {
std::cout << "OK" << std::endl << std::endl; std::cout << "OK" << std::endl << std::endl;
auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> message) { auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> message) {
if(icsneo::Message::Type::Frame == message->type) { if(icsneo::Message::Type::BusMessage == message->type) {
auto frame = std::static_pointer_cast<icsneo::BusMessage>(message); auto frame = std::static_pointer_cast<icsneo::BusMessage>(message);
if(icsneo_msg_bus_type_lin == frame->network.getType()) { if(icsneo_msg_bus_type_lin == frame->network.getType()) {
auto msg = std::static_pointer_cast<icsneo::LINMessage>(message); auto msg = std::static_pointer_cast<icsneo::LINMessage>(message);

2
examples/cpp/mdio/src/MDIOExample.cpp
View File

@ -92,7 +92,7 @@ int main()
auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> message) auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> message)
{ {
if(icsneo::Message::Type::Frame == message->type) { if(icsneo::Message::Type::BusMessage == message->type) {
auto frame = std::static_pointer_cast<icsneo::BusMessage>(message); auto frame = std::static_pointer_cast<icsneo::BusMessage>(message);
if(icsneo_msg_bus_type_mdio == frame->network.getType()) { if(icsneo_msg_bus_type_mdio == frame->network.getType()) {
auto msg = std::static_pointer_cast<icsneo::MDIOMessage>(message); auto msg = std::static_pointer_cast<icsneo::MDIOMessage>(message);

2
examples/cpp/simple/src/SimpleExample.cpp
View File

@ -169,7 +169,7 @@ int main() {
// MessageCallbacks are powerful, and can filter on things like ArbID for you. See the documentation // MessageCallbacks are powerful, and can filter on things like ArbID for you. See the documentation
auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([](std::shared_ptr<icsneo::Message> message) { auto handler = device->addMessageCallback(std::make_shared<icsneo::MessageCallback>([](std::shared_ptr<icsneo::Message> message) {
switch(message->type) { 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 // A message of type Frame is guaranteed to be a Frame, so we can static cast safely
auto frame = std::static_pointer_cast<icsneo::BusMessage>(message); auto frame = std::static_pointer_cast<icsneo::BusMessage>(message);
switch(frame->network.getType()) { switch(frame->network.getType()) {

4
examples/cpp/vsa/src/VSAExample.cpp
View File

@ -166,7 +166,7 @@ int main(int argc, char* argv[]) {
uint64_t canFrameCount = 0; uint64_t canFrameCount = 0;
uint64_t ethFrameCount = 0; uint64_t ethFrameCount = 0;
rxDevice->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> msg) { rxDevice->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> msg) {
if(msg->type != icsneo::Message::Type::Frame) { if(msg->type != icsneo::Message::Type::BusMessage) {
return; return;
} }
const auto frame = std::static_pointer_cast<icsneo::BusMessage>(msg); const auto frame = std::static_pointer_cast<icsneo::BusMessage>(msg);
@ -216,7 +216,7 @@ int main(int argc, char* argv[]) {
size_t currentMessage = 0; size_t currentMessage = 0;
rxDevice->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> msg) { rxDevice->addMessageCallback(std::make_shared<icsneo::MessageCallback>([&](std::shared_ptr<icsneo::Message> msg) {
if(msg->type != icsneo::Message::Type::Frame) { if(msg->type != icsneo::Message::Type::BusMessage) {
return; return;
} }
auto frame = std::static_pointer_cast<icsneo::BusMessage>(msg); auto frame = std::static_pointer_cast<icsneo::BusMessage>(msg);

4
include/icsneo/communication/message/filter/canmessagefilter.h
View File

@ -13,8 +13,8 @@ namespace icsneo {
class CANMessageFilter : public MessageFilter { class CANMessageFilter : public MessageFilter {
public: public:
CANMessageFilter() : MessageFilter(icsneo_msg_bus_type_can), arbid(INVALID_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::Frame; } CANMessageFilter(uint32_t arbid) : MessageFilter(icsneo_msg_bus_type_can), arbid(arbid) { messageType = Message::Type::BusMessage; }
bool match(const std::shared_ptr<Message>& message) const { bool match(const std::shared_ptr<Message>& message) const {
if(!MessageFilter::match(message)) if(!MessageFilter::match(message))

4
include/icsneo/communication/message/filter/messagefilter.h
View File

@ -27,8 +27,8 @@ public:
if(!matchMessageType(message->type)) if(!matchMessageType(message->type))
return false; return false;
if(message->type == Message::Type::Frame || message->type == Message::Type::Main51 || if(message->type == Message::Type::BusMessage || message->type == Message::Type::Main51 ||
message->type == Message::Type::RawMessage || message->type == Message::Type::ReadSettings) { message->type == Message::Type::InternalMessage || message->type == Message::Type::ReadSettings) {
const auto frame = std::static_pointer_cast<InternalMessage>(message); const auto frame = std::static_pointer_cast<InternalMessage>(message);
if(!matchNetworkType(frame->network.getType())) if(!matchNetworkType(frame->network.getType()))
return false; return false;

2
include/icsneo/communication/message/flashmemorymessage.h
View File

@ -9,7 +9,7 @@ namespace icsneo {
class FlashMemoryMessage : public InternalMessage { class FlashMemoryMessage : public InternalMessage {
public: 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; uint16_t startAddress = 0;
}; };

12
include/icsneo/communication/message/message.h
View File

@ -22,7 +22,7 @@ public:
virtual const icsneo_msg_type_t getMsgType() const { return icsneo_msg_type_device; } virtual const icsneo_msg_type_t getMsgType() const { return icsneo_msg_type_device; }
enum class Type : neomessagetype_t { enum class Type : neomessagetype_t {
Frame = 0, BusMessage = 0,
CANErrorCount = 0x100, CANErrorCount = 0x100,
@ -31,7 +31,7 @@ public:
// Past 0x8000 are all for internal use only // Past 0x8000 are all for internal use only
Invalid = 0x8000, Invalid = 0x8000,
RawMessage = 0x8001, InternalMessage = 0x8001,
ReadSettings = 0x8002, ReadSettings = 0x8002,
ResetStatus = 0x8003, ResetStatus = 0x8003,
DeviceVersion = 0x8004, DeviceVersion = 0x8004,
@ -59,10 +59,10 @@ public:
class InternalMessage : public Message { class InternalMessage : public Message {
public: 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(Message::Type type, Network net) : Message(type), network(net) {}
InternalMessage(Network net) : Message(Message::Type::RawMessage), network(net) {} InternalMessage(Network net) : Message(Message::Type::InternalMessage), network(net) {}
InternalMessage(Network net, std::vector<uint8_t> d) : Message(Message::Type::RawMessage), network(net), data(d) {} InternalMessage(Network net, std::vector<uint8_t> d) : Message(Message::Type::InternalMessage), network(net), data(d) {}
virtual const icsneo_msg_type_t getMsgType() const { return icsneo_msg_type_internal; } virtual const icsneo_msg_type_t getMsgType() const { return icsneo_msg_type_internal; }
@ -72,7 +72,7 @@ public:
class BusMessage : public InternalMessage { class BusMessage : public InternalMessage {
public: public:
BusMessage() : InternalMessage(Message::Type::Frame) {} BusMessage() : InternalMessage(Message::Type::BusMessage) {}
const icsneo_msg_type_t getMsgType() const final { return icsneo_msg_type_bus; } const icsneo_msg_type_t getMsgType() const final { return icsneo_msg_type_bus; }

2
include/icsneo/communication/message/neoreadmemorysdmessage.h
View File

@ -9,7 +9,7 @@ namespace icsneo {
class NeoReadMemorySDMessage : public InternalMessage { class NeoReadMemorySDMessage : public InternalMessage {
public: public:
NeoReadMemorySDMessage() : InternalMessage(Message::Type::RawMessage, Network::NetID::NeoMemorySDRead) {} NeoReadMemorySDMessage() : InternalMessage(Message::Type::InternalMessage, Network::NetID::NeoMemorySDRead) {}
uint32_t startAddress = 0; uint32_t startAddress = 0;
}; };