From 7fdae15aedaa25bd42486b93629f1a79ed9592df Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Wed, 7 Apr 2021 00:38:49 -0400 Subject: [PATCH] Network: Update DeviceStatus define to match the standard style --- communication/decoder.cpp | 2 +- device/device.cpp | 2 +- include/icsneo/communication/network.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/communication/decoder.cpp b/communication/decoder.cpp index 45e78c8..7882488 100644 --- a/communication/decoder.cpp +++ b/communication/decoder.cpp @@ -118,7 +118,7 @@ bool Decoder::decode(std::shared_ptr& result, const std::shared_ptr(); result->network = packet->network; // Just pass along the data, the device needs to handle this itself diff --git a/device/device.cpp b/device/device.cpp index 93a630d..d29a78c 100644 --- a/device/device.cpp +++ b/device/device.cpp @@ -541,7 +541,7 @@ void Device::handleInternalMessage(std::shared_ptr message) { case Network::NetID::Reset_Status: latestResetStatus = std::dynamic_pointer_cast(message); break; - case Network::NetID::Device_Status: + case Network::NetID::DeviceStatus: // Device Status format is unique per device, so the devices need to decode it themselves handleDeviceStatus(message); break; diff --git a/include/icsneo/communication/network.h b/include/icsneo/communication/network.h index a46b2c8..374d009 100644 --- a/include/icsneo/communication/network.h +++ b/include/icsneo/communication/network.h @@ -116,7 +116,7 @@ public: LSFTCAN2 = 99, FlexRayControl = 243, HW_COM_Latency_Test = 512, - Device_Status = 513, + DeviceStatus = 513, UDP = 514, ForwardedMessage = 516, I2C2 = 517, @@ -261,7 +261,7 @@ public: return Type::MOST; case NetID::RED: case NetID::Reset_Status: - case NetID::Device_Status: + case NetID::DeviceStatus: case NetID::FlexRayControl: return Type::Internal; case NetID::Invalid: @@ -501,7 +501,7 @@ public: return "FlexRay Control"; case NetID::HW_COM_Latency_Test: return "HW COM Latency Test"; - case NetID::Device_Status: + case NetID::DeviceStatus: return "Device Status"; case NetID::UDP: return "UDP";