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

Network: Update DeviceStatus define to match the standard style

pull/32/head
Paul Hollinsky 2021-04-07 00:38:49 -04:00
parent adb972b1f7
commit 7fdae15aed
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
communication/decoder.cpp
View File

@ -118,7 +118,7 @@ bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Pac
result = msg; result = msg;
return true; return true;
} }
case Network::NetID::Device_Status: { case Network::NetID::DeviceStatus: {
result = std::make_shared<Message>(); result = std::make_shared<Message>();
result->network = packet->network; result->network = packet->network;
// Just pass along the data, the device needs to handle this itself // Just pass along the data, the device needs to handle this itself

2
device/device.cpp
View File

@ -541,7 +541,7 @@ void Device::handleInternalMessage(std::shared_ptr<Message> message) {
case Network::NetID::Reset_Status: case Network::NetID::Reset_Status:
latestResetStatus = std::dynamic_pointer_cast<ResetStatusMessage>(message); latestResetStatus = std::dynamic_pointer_cast<ResetStatusMessage>(message);
break; 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 // Device Status format is unique per device, so the devices need to decode it themselves
handleDeviceStatus(message); handleDeviceStatus(message);
break; break;

6
include/icsneo/communication/network.h
View File

@ -116,7 +116,7 @@ public:
LSFTCAN2 = 99, LSFTCAN2 = 99,
FlexRayControl = 243, FlexRayControl = 243,
HW_COM_Latency_Test = 512, HW_COM_Latency_Test = 512,
Device_Status = 513, DeviceStatus = 513,
UDP = 514, UDP = 514,
ForwardedMessage = 516, ForwardedMessage = 516,
I2C2 = 517, I2C2 = 517,
@ -261,7 +261,7 @@ public:
return Type::MOST; return Type::MOST;
case NetID::RED: case NetID::RED:
case NetID::Reset_Status: case NetID::Reset_Status:
case NetID::Device_Status: case NetID::DeviceStatus:
case NetID::FlexRayControl: case NetID::FlexRayControl:
return Type::Internal; return Type::Internal;
case NetID::Invalid: case NetID::Invalid:
@ -501,7 +501,7 @@ public:
return "FlexRay Control"; return "FlexRay Control";
case NetID::HW_COM_Latency_Test: case NetID::HW_COM_Latency_Test:
return "HW COM Latency Test"; return "HW COM Latency Test";
case NetID::Device_Status: case NetID::DeviceStatus:
return "Device Status"; return "Device Status";
case NetID::UDP: case NetID::UDP:
return "UDP"; return "UDP";