diff --git a/server/src/hardware/interface/marklincaninterface.cpp b/server/src/hardware/interface/marklincaninterface.cpp index f6cae468..cd62ecaf 100644 --- a/server/src/hardware/interface/marklincaninterface.cpp +++ b/server/src/hardware/interface/marklincaninterface.cpp @@ -40,7 +40,7 @@ MarklinCANInterface::MarklinCANInterface(World& world, std::string_view _id) : Interface(world, _id) , DecoderController(*this, decoderListColumns) , InputController(static_cast(*this)) - , type{this, "type", MarklinCANInterfaceType::TCP, PropertyFlags::ReadWrite | PropertyFlags::Store} + , type{this, "type", MarklinCANInterfaceType::NetworkTCP, PropertyFlags::ReadWrite | PropertyFlags::Store} , hostname{this, "hostname", "", PropertyFlags::ReadWrite | PropertyFlags::Store} { name = "M\u00E4rklin CAN"; @@ -106,11 +106,11 @@ bool MarklinCANInterface::setOnline(bool& value, bool simulation) { switch(type.value()) { - case MarklinCANInterfaceType::TCP: + case MarklinCANInterfaceType::NetworkTCP: m_kernel = MarklinCAN::Kernel::create(config, hostname.value()); break; - case MarklinCANInterfaceType::UDP: + case MarklinCANInterfaceType::NetworkUDP: m_kernel = MarklinCAN::Kernel::create(config, hostname.value()); break; } diff --git a/shared/src/traintastic/enum/marklincaninterfacetype.hpp b/shared/src/traintastic/enum/marklincaninterfacetype.hpp index 6a3b4e2f..b9aaabb2 100644 --- a/shared/src/traintastic/enum/marklincaninterfacetype.hpp +++ b/shared/src/traintastic/enum/marklincaninterfacetype.hpp @@ -29,19 +29,19 @@ enum class MarklinCANInterfaceType : uint16_t { - TCP = 0, - UDP = 1, + NetworkTCP = 0, + NetworkUDP = 1, }; TRAINTASTIC_ENUM(MarklinCANInterfaceType, "marklin_can_interface_type", 2, { - {MarklinCANInterfaceType::TCP, "tcp"}, - {MarklinCANInterfaceType::UDP, "udp"}, + {MarklinCANInterfaceType::NetworkTCP, "network_tcp"}, + {MarklinCANInterfaceType::NetworkUDP, "network_udp"}, }); inline constexpr std::array marklinCANInterfaceTypeValues{{ - MarklinCANInterfaceType::TCP, - MarklinCANInterfaceType::UDP, + MarklinCANInterfaceType::NetworkTCP, + MarklinCANInterfaceType::NetworkUDP, }}; #endif diff --git a/shared/translations/en-us.json b/shared/translations/en-us.json index e826e44e..59635639 100644 --- a/shared/translations/en-us.json +++ b/shared/translations/en-us.json @@ -4222,5 +4222,13 @@ "term_plural": "", "reference": "", "comment": "" + }, + { + "term": "marklin_can_interface_type:network_tcp", + "definition": "Network (TCP)" + }, + { + "term": "marklin_can_interface_type:network_udp", + "definition": "Network (UDP)" } ] \ No newline at end of file diff --git a/shared/translations/neutral.json b/shared/translations/neutral.json index 2b2c84df..03a50ec4 100644 --- a/shared/translations/neutral.json +++ b/shared/translations/neutral.json @@ -358,13 +358,5 @@ { "term": "decoder_protocol:selectrix", "definition": "Selectrix" - }, - { - "term": "marklin_can_interface_type:tcp", - "definition": "TCP" - }, - { - "term": "marklin_can_interface_type:udp", - "definition": "UDP" } ] \ No newline at end of file