.gitlab-ci.yml

@@ -243,6 +243,30 @@ unit_test linux/ubuntu/2404/amd64/clang:
     - linux-build
   timeout: 5m
 
+build linux/fedora/41/amd64/gcc:
+  <<: *build_linux_fedora_gcc
+  image: fedora:41
+
+unit_test linux/fedora/41/amd64/gcc:
+  <<: *test_linux_fedora_gcc
+  image: fedora:41
+  dependencies:
+    - build linux/fedora/41/amd64/gcc
+  needs:
+    - build linux/fedora/41/amd64/gcc
+
+build linux/fedora/41/amd64/clang:
+  <<: *build_linux_fedora_clang
+  image: fedora:41
+
+unit_test linux/fedora/41/amd64/clang:
+  <<: *test_linux_fedora_clang
+  image: fedora:41
+  dependencies:
+    - build linux/fedora/41/amd64/clang
+  needs:
+    - build linux/fedora/41/amd64/clang
+
 build linux/fedora/42/amd64/gcc:
   <<: *build_linux_fedora_gcc
   image: fedora:42
@@ -267,30 +291,6 @@ unit_test linux/fedora/42/amd64/clang:
   needs:
     - build linux/fedora/42/amd64/clang
 
-build linux/fedora/43/amd64/gcc:
-  <<: *build_linux_fedora_gcc
-  image: fedora:43
-
-unit_test linux/fedora/43/amd64/gcc:
-  <<: *test_linux_fedora_gcc
-  image: fedora:43
-  dependencies:
-    - build linux/fedora/43/amd64/gcc
-  needs:
-    - build linux/fedora/43/amd64/gcc
-
-build linux/fedora/43/amd64/clang:
-  <<: *build_linux_fedora_clang
-  image: fedora:43
-
-unit_test linux/fedora/43/amd64/clang:
-  <<: *test_linux_fedora_clang
-  image: fedora:43
-  dependencies:
-    - build linux/fedora/43/amd64/clang
-  needs:
-    - build linux/fedora/43/amd64/clang
-
 #-------------------------------------------------------------------------------
 # Python Module
 #-------------------------------------------------------------------------------

api/icsneolegacy/icsneolegacy.cpp

@@ -90,7 +90,6 @@ static bool NeoMessageToSpyMessage(const neodevice_t* device, const neomessage_t
 		copyFrameData();
 		break;
 	case Network::Type::Ethernet:
-	case Network::Type::AutomotiveEthernet:
 		oldmsg.Protocol = SPY_PROTOCOL_ETHERNET;
 		oldmsg.NumberBytesData = static_cast<uint8_t>(frame.length & 0xFF);
 		oldmsg.NumberBytesHeader = static_cast<uint8_t>(frame.length >> 8);

bindings/python/icsneopy/communication/message/ethernetstatusmessage.cpp

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

bindings/python/icsneopy/communication/network.cpp

@@ -179,11 +179,10 @@ void init_network(pybind11::module_& m) {
 		.value("LSFTCAN", Network::Type::LSFTCAN)
 		.value("SWCAN", Network::Type::SWCAN)
 		.value("ISO9141", Network::Type::ISO9141)
-		.value("I2C", Network::Type::I2C)
+		.value("I2C_01", Network::Type::I2C)
 		.value("A2B", Network::Type::A2B)
 		.value("SPI", Network::Type::SPI)
 		.value("MDIO", Network::Type::MDIO)
-		.value("AutomotiveEthernet", Network::Type::AutomotiveEthernet)
 		.value("Any", Network::Type::Any)
 		.value("Other", Network::Type::Other);
 

communication/decoder.cpp

@@ -62,8 +62,7 @@ uint64_t Decoder::GetUInt64FromLEBytes(const uint8_t* bytes) {
 
 bool Decoder::decode(std::shared_ptr<Message>& result, const std::shared_ptr<Packet>& packet) {
 	switch(packet->network.getType()) {
-		case Network::Type::Ethernet:
-		case Network::Type::AutomotiveEthernet: {
+		case Network::Type::Ethernet: {
 			result = HardwareEthernetPacket::DecodeToMessage(packet->data);
 			if(!result) {
 				report(APIEvent::Type::PacketDecodingError, APIEvent::Severity::Error);

communication/encoder.cpp

@@ -32,8 +32,7 @@ bool Encoder::encode(const Packetizer& packetizer, std::vector<uint8_t>& result,
 			netid = uint16_t(frame->network.getNetID());
 
 			switch(frame->network.getType()) {
-				case Network::Type::Ethernet:
-				case Network::Type::AutomotiveEthernet: {
+				case Network::Type::Ethernet: {
 					auto ethmsg = std::dynamic_pointer_cast<EthernetMessage>(message);
 					if(!ethmsg) {
 						report(APIEvent::Type::MessageFormattingError, APIEvent::Severity::Error);

communication/message/ethernetstatusmessage.cpp

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

communication/message/neomessage.cpp

@@ -44,8 +44,7 @@ neomessage_t icsneo::CreateNeoMessage(const std::shared_ptr<Message> message) {
 				can.status.canfdESI = canmsg->errorStateIndicator;
 				break;
 			}
-			case Network::Type::Ethernet:
-			case Network::Type::AutomotiveEthernet: {
+			case Network::Type::Ethernet: {
 				neomessage_eth_t& eth = *(neomessage_eth_t*)&neomsg;
 				auto ethmsg = std::static_pointer_cast<EthernetMessage>(message);
 				eth.preemptionFlags = ethmsg->preemptionFlags;
@@ -143,8 +142,7 @@ std::shared_ptr<Message> icsneo::CreateMessageFromNeoMessage(const neomessage_t*
 					canmsg->errorStateIndicator = can.status.canfdESI;
 					return canmsg;
 				}
-				case Network::Type::Ethernet:
-				case Network::Type::AutomotiveEthernet: {
+				case Network::Type::Ethernet: {
 					neomessage_eth_t& eth = *(neomessage_eth_t*)neomessage;
 					auto ethmsg = std::make_shared<EthernetMessage>();
 					ethmsg->network = network;

communication/message/transmitmessage.cpp

@@ -136,7 +136,6 @@ std::vector<uint8_t> TransmitMessage::EncodeFromMessage(std::shared_ptr<Frame> f
 	std::vector<uint8_t> result;
 	switch(frame->network.getType()) {
 		case Network::Type::Ethernet:
-		case Network::Type::AutomotiveEthernet:
 			result = EncodeFromMessageEthernet(frame, report);
 			break;
 		case Network::Type::CAN:

examples/cpp/interactive/src/InteractiveExample.cpp

@@ -214,8 +214,7 @@ void printMessage(const std::shared_ptr<icsneo::Message>& message) {
 					std::cout << std::dec << '(' << canMessage->timestamp << " ns since 1/1/2007)\n";
 					break;
 				}
-				case icsneo::Network::Type::Ethernet:
-				case icsneo::Network::Type::AutomotiveEthernet: {
+				case icsneo::Network::Type::Ethernet: {
 					auto ethMessage = std::static_pointer_cast<icsneo::EthernetMessage>(message);
 
 					std::cout << "\t\t" << ethMessage->network << " Frame - " << std::dec

examples/cpp/simple/src/SimpleExample.cpp

@@ -199,8 +199,7 @@ int main() {
 							std::cout << std::dec << '(' << canMessage->timestamp << " ns since 1/1/2007)\n";
 							break;
 						}
-						case icsneo::Network::Type::Ethernet:
-						case icsneo::Network::Type::AutomotiveEthernet: {
+						case icsneo::Network::Type::Ethernet: {
 							auto ethMessage = std::static_pointer_cast<icsneo::EthernetMessage>(message);
 
 							std::cout << "\t\t" << ethMessage->network << " Frame - " << std::dec

examples/cpp/vsa/src/VSAExample.cpp

@@ -172,7 +172,7 @@ int main(int argc, char* argv[]) {
 		const auto frame = std::static_pointer_cast<icsneo::Frame>(msg);
 		if(frame->network.getType() == icsneo::Network::Type::CAN) {
 			++canFrameCount;
-		} else if(frame->network.getType() == icsneo::Network::Type::AutomotiveEthernet || frame->network.getType() == icsneo::Network::Type::Ethernet) {
+		} else if(frame->network.getType() == icsneo::Network::Type::Ethernet) {
 			++ethFrameCount;
 		}
 	}));

include/icsneo/communication/message/ethernetstatusmessage.h

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