From 4901168068d9b5a4e8a2ef369029bbcc398ee396 Mon Sep 17 00:00:00 2001 From: David Rebbe Date: Tue, 3 Dec 2024 23:59:19 -0500 Subject: [PATCH] renamed RawMessage to InternalMessage --- api/icsneoc/icsneoc.cpp | 2 +- communication/decoder.cpp | 8 ++++---- communication/encoder.cpp | 4 ++-- device/device.cpp | 6 +++--- .../icsneo/communication/message/apperrormessage.h | 4 ++-- .../icsneo/communication/message/diskdatamessage.h | 4 ++-- .../communication/message/filter/messagefilter.h | 2 +- .../communication/message/flashmemorymessage.h | 4 ++-- .../icsneo/communication/message/livedatamessage.h | 4 ++-- .../icsneo/communication/message/main51message.h | 4 ++-- include/icsneo/communication/message/message.h | 14 +++++++------- .../communication/message/neoreadmemorysdmessage.h | 4 ++-- .../communication/message/readsettingsmessage.h | 4 ++-- include/icsneo/device/device.h | 2 +- include/icsneo/device/tree/neovifire2/neovifire2.h | 2 +- include/icsneo/device/tree/plasion/plasion.h | 2 +- include/icsneo/device/tree/radgalaxy/radgalaxy.h | 2 +- .../icsneo/device/tree/radgigastar/radgigastar.h | 2 +- .../icsneo/device/tree/radgigastar2/radgigastar2.h | 2 +- include/icsneo/device/tree/radmars/radmars.h | 2 +- .../icsneo/device/tree/valuecan4/valuecan4-2el.h | 2 +- 21 files changed, 40 insertions(+), 40 deletions(-) diff --git a/api/icsneoc/icsneoc.cpp b/api/icsneoc/icsneoc.cpp index 4b9da87..c4f15ab 100644 --- a/api/icsneoc/icsneoc.cpp +++ b/api/icsneoc/icsneoc.cpp @@ -738,7 +738,7 @@ int icsneo_getDeviceStatus(const neodevice_t* device, void* status, size_t* size if(!msg) // Did not receive a message return false; - auto rawMessage = std::static_pointer_cast(msg); + auto rawMessage = std::static_pointer_cast(msg); if(!rawMessage || (rawMessage->network.getNetID() != Network::NetID::DeviceStatus)) return false; diff --git a/communication/decoder.cpp b/communication/decoder.cpp index 0fbe17f..d20c276 100644 --- a/communication/decoder.cpp +++ b/communication/decoder.cpp @@ -230,7 +230,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptrdata.size() < 24) { - auto rawmsg = std::make_shared(Network::NetID::Device); + auto rawmsg = std::make_shared(Network::NetID::Device); result = rawmsg; rawmsg->data = packet->data; return true; @@ -244,7 +244,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(result.get()); + auto* raw = dynamic_cast(result.get()); if(raw == nullptr) { report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error); return false; // A nullptr was returned, the packet was malformed @@ -255,7 +255,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(packet->network, packet->data); + result = std::make_shared(packet->network, packet->data); return true; } case Network::NetID::RED_INT_MEMORYREAD: { @@ -483,6 +483,6 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(packet->network, packet->data); + result = std::make_shared(packet->network, packet->data); return true; } diff --git a/communication/encoder.cpp b/communication/encoder.cpp index 395b2c5..fe6258c 100644 --- a/communication/encoder.cpp +++ b/communication/encoder.cpp @@ -131,7 +131,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, break; } case Message::Type::RawMessage: { - auto raw = std::dynamic_pointer_cast(message); + auto raw = std::dynamic_pointer_cast(message); // Raw message uses raw->data as the buffer unless directed otherwise buffer = &raw->data; @@ -243,7 +243,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector& result, * In this case, command 0x06 is SetLEDState. * This old command type is not really used anywhere else. */ - auto canmsg = std::make_shared(Network::NetID::Device); + auto canmsg = std::make_shared(Network::NetID::Device); msg = canmsg; if(arguments.empty()) { report(APIEvent::Type::MessageFormattingError, APIEvent::Severity::Error); diff --git a/device/device.cpp b/device/device.cpp index 531fe1d..80174cb 100644 --- a/device/device.cpp +++ b/device/device.cpp @@ -472,7 +472,7 @@ int8_t Device::prepareScriptLoad() { return false; } - const auto resp = std::static_pointer_cast(generic); + const auto resp = std::static_pointer_cast(generic); retVal = (int8_t)resp->data[0]; } @@ -1719,7 +1719,7 @@ void Device::handleInternalMessage(std::shared_ptr message) { latestResetStatus = std::static_pointer_cast(message); break; case Message::Type::RawMessage: { - auto rawMessage = std::static_pointer_cast(message); + 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 @@ -1895,7 +1895,7 @@ std::optional> Device::getRTC if(!generic) // Did not receive a message return std::nullopt; - auto rawMes = std::dynamic_pointer_cast(generic); + auto rawMes = std::dynamic_pointer_cast(generic); if(!rawMes) return std::nullopt; diff --git a/include/icsneo/communication/message/apperrormessage.h b/include/icsneo/communication/message/apperrormessage.h index 8c81b54..e3dbc62 100644 --- a/include/icsneo/communication/message/apperrormessage.h +++ b/include/icsneo/communication/message/apperrormessage.h @@ -64,9 +64,9 @@ enum class AppErrorType : uint16_t { AppNoError = 255 }; -class AppErrorMessage : public RawMessage { +class AppErrorMessage : public InternalMessage { public: - AppErrorMessage() : RawMessage(Message::Type::AppError, Network::NetID::RED_App_Error) {} + AppErrorMessage() : InternalMessage(Message::Type::AppError, Network::NetID::RED_App_Error) {} uint16_t errorType; Network::NetID errorNetID; uint32_t timestamp10us; diff --git a/include/icsneo/communication/message/diskdatamessage.h b/include/icsneo/communication/message/diskdatamessage.h index 6681c5a..899f1a8 100644 --- a/include/icsneo/communication/message/diskdatamessage.h +++ b/include/icsneo/communication/message/diskdatamessage.h @@ -7,9 +7,9 @@ namespace icsneo { -class DiskDataMessage : public RawMessage { +class DiskDataMessage : public InternalMessage { public: - DiskDataMessage(std::vector&& d) : RawMessage(Network::NetID::DiskData) { + DiskDataMessage(std::vector&& d) : InternalMessage(Network::NetID::DiskData) { data = std::move(d); } }; diff --git a/include/icsneo/communication/message/filter/messagefilter.h b/include/icsneo/communication/message/filter/messagefilter.h index 3b0dbbe..3ecd4a3 100644 --- a/include/icsneo/communication/message/filter/messagefilter.h +++ b/include/icsneo/communication/message/filter/messagefilter.h @@ -29,7 +29,7 @@ public: if(message->type == Message::Type::Frame || message->type == Message::Type::Main51 || message->type == Message::Type::RawMessage || message->type == Message::Type::ReadSettings) { - const auto frame = std::static_pointer_cast(message); + const auto frame = std::static_pointer_cast(message); if(!matchNetworkType(frame->network.getType())) return false; if(!matchNetID(frame->network.getNetID())) diff --git a/include/icsneo/communication/message/flashmemorymessage.h b/include/icsneo/communication/message/flashmemorymessage.h index 4ac2e6b..97200b3 100644 --- a/include/icsneo/communication/message/flashmemorymessage.h +++ b/include/icsneo/communication/message/flashmemorymessage.h @@ -7,9 +7,9 @@ namespace icsneo { -class FlashMemoryMessage : public RawMessage { +class FlashMemoryMessage : public InternalMessage { public: - FlashMemoryMessage() : RawMessage(Message::Type::RawMessage, Network::NetID::RED_INT_MEMORYREAD) {} + FlashMemoryMessage() : InternalMessage(Message::Type::RawMessage, Network::NetID::RED_INT_MEMORYREAD) {} uint16_t startAddress = 0; }; diff --git a/include/icsneo/communication/message/livedatamessage.h b/include/icsneo/communication/message/livedatamessage.h index 853e761..87554a9 100644 --- a/include/icsneo/communication/message/livedatamessage.h +++ b/include/icsneo/communication/message/livedatamessage.h @@ -8,9 +8,9 @@ #include "icsneo/communication/livedata.h" namespace icsneo { -class LiveDataMessage : public RawMessage { +class LiveDataMessage : public InternalMessage { public: - LiveDataMessage() : RawMessage(Message::Type::LiveData, Network::NetID::ExtendedCommand) {} + LiveDataMessage() : InternalMessage(Message::Type::LiveData, Network::NetID::ExtendedCommand) {} LiveDataHandle handle; LiveDataCommand cmd; }; diff --git a/include/icsneo/communication/message/main51message.h b/include/icsneo/communication/message/main51message.h index 12f51ea..1f2d288 100644 --- a/include/icsneo/communication/message/main51message.h +++ b/include/icsneo/communication/message/main51message.h @@ -8,9 +8,9 @@ namespace icsneo { -class Main51Message : public RawMessage { +class Main51Message : public InternalMessage { public: - Main51Message() : RawMessage(Message::Type::Main51, Network::NetID::Main51) {} + Main51Message() : InternalMessage(Message::Type::Main51, Network::NetID::Main51) {} Command command = Command(0); bool forceShortFormat = false; // Necessary for EnableNetworkCom and EnableNetworkComEx }; diff --git a/include/icsneo/communication/message/message.h b/include/icsneo/communication/message/message.h index 2f144c5..29e00f6 100644 --- a/include/icsneo/communication/message/message.h +++ b/include/icsneo/communication/message/message.h @@ -57,12 +57,12 @@ public: uint64_t timestamp = 0; }; -class RawMessage : public Message { +class InternalMessage : public Message { public: - RawMessage(Message::Type type = Message::Type::RawMessage) : Message(type) {} - RawMessage(Message::Type type, Network net) : Message(type), network(net) {} - RawMessage(Network net) : Message(Message::Type::RawMessage), network(net) {} - RawMessage(Network net, std::vector d) : Message(Message::Type::RawMessage), network(net), data(d) {} + InternalMessage(Message::Type type = Message::Type::RawMessage) : 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) {} virtual const icsneo_msg_type_t getMsgType() const { return icsneo_msg_type_internal; } @@ -70,9 +70,9 @@ public: std::vector data; }; -class BusMessage : public RawMessage { +class BusMessage : public InternalMessage { public: - BusMessage() : RawMessage(Message::Type::Frame) {} + BusMessage() : InternalMessage(Message::Type::Frame) {} 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 bf9bfcc..1410946 100644 --- a/include/icsneo/communication/message/neoreadmemorysdmessage.h +++ b/include/icsneo/communication/message/neoreadmemorysdmessage.h @@ -7,9 +7,9 @@ namespace icsneo { -class NeoReadMemorySDMessage : public RawMessage { +class NeoReadMemorySDMessage : public InternalMessage { public: - NeoReadMemorySDMessage() : RawMessage(Message::Type::RawMessage, Network::NetID::NeoMemorySDRead) {} + NeoReadMemorySDMessage() : InternalMessage(Message::Type::RawMessage, Network::NetID::NeoMemorySDRead) {} uint32_t startAddress = 0; }; diff --git a/include/icsneo/communication/message/readsettingsmessage.h b/include/icsneo/communication/message/readsettingsmessage.h index 7c05ecf..d2625ca 100644 --- a/include/icsneo/communication/message/readsettingsmessage.h +++ b/include/icsneo/communication/message/readsettingsmessage.h @@ -8,9 +8,9 @@ namespace icsneo { -class ReadSettingsMessage : public RawMessage { +class ReadSettingsMessage : public InternalMessage { public: - ReadSettingsMessage() : RawMessage(Message::Type::ReadSettings, Network::NetID::ReadSettings) {} + ReadSettingsMessage() : InternalMessage(Message::Type::ReadSettings, Network::NetID::ReadSettings) {} enum class Response : uint8_t { OK = 0, diff --git a/include/icsneo/device/device.h b/include/icsneo/device/device.h index 63c3720..c0ef39a 100644 --- a/include/icsneo/device/device.h +++ b/include/icsneo/device/device.h @@ -835,7 +835,7 @@ protected: void handleInternalMessage(std::shared_ptr message); - virtual void handleDeviceStatus(const std::shared_ptr&) {} + virtual void handleDeviceStatus(const std::shared_ptr&) {} neodevice_t& getWritableNeoDevice() { return data; } diff --git a/include/icsneo/device/tree/neovifire2/neovifire2.h b/include/icsneo/device/tree/neovifire2/neovifire2.h index b7583d1..e202fe2 100644 --- a/include/icsneo/device/tree/neovifire2/neovifire2.h +++ b/include/icsneo/device/tree/neovifire2/neovifire2.h @@ -121,7 +121,7 @@ protected: // The supported TX networks are the same as the supported RX networks for this device void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } - void handleDeviceStatus(const std::shared_ptr& message) override { + void handleDeviceStatus(const std::shared_ptr& message) override { if(message->data.size() < sizeof(neovifire2_status_t)) return; std::lock_guard lk(ioMutex); diff --git a/include/icsneo/device/tree/plasion/plasion.h b/include/icsneo/device/tree/plasion/plasion.h index b629d9b..4dbcf8f 100644 --- a/include/icsneo/device/tree/plasion/plasion.h +++ b/include/icsneo/device/tree/plasion/plasion.h @@ -81,7 +81,7 @@ protected: return ret; } - void handleDeviceStatus(const std::shared_ptr& message) override { + void handleDeviceStatus(const std::shared_ptr& message) override { if(message->data.size() < sizeof(fire2vnet_status_t)) return; std::lock_guard lk(ioMutex); diff --git a/include/icsneo/device/tree/radgalaxy/radgalaxy.h b/include/icsneo/device/tree/radgalaxy/radgalaxy.h index 745a29a..f916314 100644 --- a/include/icsneo/device/tree/radgalaxy/radgalaxy.h +++ b/include/icsneo/device/tree/radgalaxy/radgalaxy.h @@ -91,7 +91,7 @@ protected: // The supported TX networks are the same as the supported RX networks for this device void setupSupportedTXNetworks(std::vector& txNetworks) override { setupSupportedRXNetworks(txNetworks); } - void handleDeviceStatus(const std::shared_ptr& message) override { + void handleDeviceStatus(const std::shared_ptr& message) override { if(message->data.size() < sizeof(radgalaxy_status_t)) return; std::lock_guard lk(ioMutex); diff --git a/include/icsneo/device/tree/radgigastar/radgigastar.h b/include/icsneo/device/tree/radgigastar/radgigastar.h index 89f0db2..248d4d9 100644 --- a/include/icsneo/device/tree/radgigastar/radgigastar.h +++ b/include/icsneo/device/tree/radgigastar/radgigastar.h @@ -104,7 +104,7 @@ protected: txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end()); } - void handleDeviceStatus(const std::shared_ptr& message) override { + void handleDeviceStatus(const std::shared_ptr& message) override { if(message->data.size() < sizeof(radgigastar_status_t)) return; std::lock_guard lk(ioMutex); diff --git a/include/icsneo/device/tree/radgigastar2/radgigastar2.h b/include/icsneo/device/tree/radgigastar2/radgigastar2.h index ff24d7a..740d528 100644 --- a/include/icsneo/device/tree/radgigastar2/radgigastar2.h +++ b/include/icsneo/device/tree/radgigastar2/radgigastar2.h @@ -112,7 +112,7 @@ namespace icsneo // The supported TX networks are the same as the supported RX networks for this device void setupSupportedTXNetworks(std::vector &txNetworks) override { setupSupportedRXNetworks(txNetworks); } - void handleDeviceStatus(const std::shared_ptr &message) override + void handleDeviceStatus(const std::shared_ptr &message) override { if (message->data.size() < sizeof(radgigastar2_status_t)) return; diff --git a/include/icsneo/device/tree/radmars/radmars.h b/include/icsneo/device/tree/radmars/radmars.h index bcd120a..e112082 100644 --- a/include/icsneo/device/tree/radmars/radmars.h +++ b/include/icsneo/device/tree/radmars/radmars.h @@ -96,7 +96,7 @@ protected: txNetworks.insert(txNetworks.end(), supportedTxNetworks.begin(), supportedTxNetworks.end()); } - void handleDeviceStatus(const std::shared_ptr& message) override { + void handleDeviceStatus(const std::shared_ptr& message) override { if(message->data.size() < sizeof(radmars_status_t)) return; std::lock_guard lk(ioMutex); diff --git a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h index 340fc25..aa310df 100644 --- a/include/icsneo/device/tree/valuecan4/valuecan4-2el.h +++ b/include/icsneo/device/tree/valuecan4/valuecan4-2el.h @@ -75,7 +75,7 @@ protected: size_t getEthernetActivationLineCount() const override { return 1; } - void handleDeviceStatus(const std::shared_ptr& message) override { + void handleDeviceStatus(const std::shared_ptr& message) override { if(message->data.size() < sizeof(valuecan4_2el_status_t)) return; std::lock_guard lk(ioMutex);