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

Communication: EthernetStatusMessage: Add BASE-T support

pull/76/merge
Kyle Schwarz 2025-10-30 21:13:20 -04:00
parent f3cb41d60b
commit d51f88d023
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bindings/python/icsneopy/communication/message/ethernetstatusmessage.cpp
View File

@ -22,7 +22,8 @@ void init_ethernetstatusmessage(pybind11::module_& m) {
.value("LinkModeAuto", EthernetStatusMessage::LinkMode::LinkModeAuto) .value("LinkModeAuto", EthernetStatusMessage::LinkMode::LinkModeAuto)
.value("LinkModeMaster", EthernetStatusMessage::LinkMode::LinkModeMaster) .value("LinkModeMaster", EthernetStatusMessage::LinkMode::LinkModeMaster)
.value("LinkModeSlave", EthernetStatusMessage::LinkMode::LinkModeSlave) .value("LinkModeSlave", EthernetStatusMessage::LinkMode::LinkModeSlave)
.value("LinkModeInvalid", EthernetStatusMessage::LinkMode::LinkModeInvalid); .value("LinkModeInvalid", EthernetStatusMessage::LinkMode::LinkModeInvalid)
.value("LinkModeNone", EthernetStatusMessage::LinkMode::LinkModeNone);
ethernetStatusMessage ethernetStatusMessage
.def_readonly("network", &EthernetStatusMessage::network) .def_readonly("network", &EthernetStatusMessage::network)

33
communication/message/ethernetstatusmessage.cpp
View File

@ -13,7 +13,14 @@ enum LinkSpeed {
ethSpeed10000, ethSpeed10000,
}; };
enum LinkMode { enum TLinkMode {
T_LINK_NONE,
T_LINK_MASTER,
T_LINK_SLAVE,
T_LINK_AUTO,
};
enum AELinkMode {
AE_LINK_AUTO, AE_LINK_AUTO,
AE_LINK_MASTER, AE_LINK_MASTER,
AE_LINK_SLAVE, AE_LINK_SLAVE,
@ -46,11 +53,25 @@ std::shared_ptr<Message> EthernetStatusMessage::DecodeToMessage(const std::vecto
default: return nullptr; default: return nullptr;
} }
LinkMode mode; LinkMode mode;
switch(packet->mode) { switch(Network(packet->network).getType()) {
case AE_LINK_INVALID: mode = EthernetStatusMessage::LinkMode::LinkModeInvalid; break; case Network::Type::Ethernet:
case AE_LINK_AUTO: mode = EthernetStatusMessage::LinkMode::LinkModeAuto; break; switch(packet->mode) {
case AE_LINK_MASTER: mode = EthernetStatusMessage::LinkMode::LinkModeMaster; break; case T_LINK_NONE: mode = EthernetStatusMessage::LinkMode::LinkModeNone; break;
case AE_LINK_SLAVE: mode = EthernetStatusMessage::LinkMode::LinkModeSlave; break; case T_LINK_MASTER: mode = EthernetStatusMessage::LinkMode::LinkModeMaster; break;
case T_LINK_SLAVE: mode = EthernetStatusMessage::LinkMode::LinkModeSlave; break;
case T_LINK_AUTO: mode = EthernetStatusMessage::LinkMode::LinkModeAuto; break;
default: return nullptr;
}
break;
case Network::Type::AutomotiveEthernet:
switch(packet->mode) {
case AE_LINK_AUTO: mode = EthernetStatusMessage::LinkMode::LinkModeAuto; break;
case AE_LINK_MASTER: mode = EthernetStatusMessage::LinkMode::LinkModeMaster; break;
case AE_LINK_SLAVE: mode = EthernetStatusMessage::LinkMode::LinkModeSlave; break;
case AE_LINK_INVALID: mode = EthernetStatusMessage::LinkMode::LinkModeInvalid; break;
default: return nullptr;
}
break;
default: return nullptr; default: return nullptr;
} }
return std::make_shared<EthernetStatusMessage>(packet->network, packet->state, speed, packet->duplex, mode); return std::make_shared<EthernetStatusMessage>(packet->network, packet->state, speed, packet->duplex, mode);

1
include/icsneo/communication/message/ethernetstatusmessage.h
View File

@ -25,6 +25,7 @@ public:
LinkModeMaster, LinkModeMaster,
LinkModeSlave, LinkModeSlave,
LinkModeInvalid, LinkModeInvalid,
LinkModeNone,
}; };
EthernetStatusMessage(Network net, bool state, LinkSpeed speed, bool duplex, LinkMode mode) : Message(Type::EthernetStatus), EthernetStatusMessage(Network net, bool state, LinkSpeed speed, bool duplex, LinkMode mode) : Message(Type::EthernetStatus),
network(net), state(state), speed(speed), duplex(duplex), mode(mode) {} network(net), state(state), speed(speed), duplex(duplex), mode(mode) {}