From 558dd7e44523817a00a8a074300bbcb694167e12 Mon Sep 17 00:00:00 2001 From: Reinder Feenstra Date: Fri, 12 Apr 2024 23:37:08 +0200 Subject: [PATCH] loconet: added Uhlenbrock Intellibox IR and Basic --- server/src/hardware/protocol/loconet/settings.cpp | 4 ++++ shared/src/traintastic/enum/loconetcommandstation.hpp | 10 ++++++++-- shared/translations/neutral.json | 8 ++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/server/src/hardware/protocol/loconet/settings.cpp b/server/src/hardware/protocol/loconet/settings.cpp index a77523dc..f3a52a09 100644 --- a/server/src/hardware/protocol/loconet/settings.cpp +++ b/server/src/hardware/protocol/loconet/settings.cpp @@ -152,6 +152,8 @@ void Settings::commandStationChanged(LocoNetCommandStation value) case LocoNetCommandStation::UhlenbrockIntellibox: case LocoNetCommandStation::UhlenbrockIBCOM: + case LocoNetCommandStation::UhlenbrockIntelliboxIR: + case LocoNetCommandStation::UhlenbrockIntelliboxBasic: locomotiveSlots = 32; f9f28 = LocoNetF9F28::UhlenbrockExtended; break; @@ -168,6 +170,8 @@ void Settings::commandStationChanged(LocoNetCommandStation value) case LocoNetCommandStation::UhlenbrockIntellibox: case LocoNetCommandStation::UhlenbrockIBCOM: + case LocoNetCommandStation::UhlenbrockIntelliboxIR: + case LocoNetCommandStation::UhlenbrockIntelliboxBasic: fastClockSyncEnabled = false; Attributes::setEnabled(fastClockSyncEnabled, false); break; diff --git a/shared/src/traintastic/enum/loconetcommandstation.hpp b/shared/src/traintastic/enum/loconetcommandstation.hpp index bf6e3dce..5fe3022a 100644 --- a/shared/src/traintastic/enum/loconetcommandstation.hpp +++ b/shared/src/traintastic/enum/loconetcommandstation.hpp @@ -33,21 +33,27 @@ enum class LocoNetCommandStation : uint16_t UhlenbrockIntellibox = 1, DigikeijsDR5000 = 2, UhlenbrockIBCOM = 3, + UhlenbrockIntelliboxIR = 4, + UhlenbrockIntelliboxBasic = 5, }; -TRAINTASTIC_ENUM(LocoNetCommandStation, "loconet_command_station", 4, +TRAINTASTIC_ENUM(LocoNetCommandStation, "loconet_command_station", 6, { {LocoNetCommandStation::Custom, "custom"}, {LocoNetCommandStation::UhlenbrockIntellibox, "uhlenbrock_intellibox"}, {LocoNetCommandStation::DigikeijsDR5000, "digikeijs_dr5000"}, {LocoNetCommandStation::UhlenbrockIBCOM, "uhlenbrock_ibcom"}, + {LocoNetCommandStation::UhlenbrockIntelliboxIR, "uhlenbrock_intellibox_ir"}, + {LocoNetCommandStation::UhlenbrockIntelliboxBasic, "uhlenbrock_intellibox_basic"}, }); -inline constexpr std::array LocoNetCommandStationValues{{ +inline constexpr std::array LocoNetCommandStationValues{{ LocoNetCommandStation::Custom, LocoNetCommandStation::DigikeijsDR5000, LocoNetCommandStation::UhlenbrockIntellibox, LocoNetCommandStation::UhlenbrockIBCOM, + LocoNetCommandStation::UhlenbrockIntelliboxIR, + LocoNetCommandStation::UhlenbrockIntelliboxBasic, }}; #endif diff --git a/shared/translations/neutral.json b/shared/translations/neutral.json index d870533e..3fb7302a 100644 --- a/shared/translations/neutral.json +++ b/shared/translations/neutral.json @@ -378,5 +378,13 @@ { "term": "output_channel:dcc_ext", "definition": "DCCext (RCN-213)" + }, + { + "term": "loconet_command_station:uhlenbrock_intellibox_ir", + "definition": "Uhlenbrock Intellibox IR" + }, + { + "term": "loconet_command_station:uhlenbrock_intellibox_basic", + "definition": "Uhlenbrock Intellibox Basic" } ] \ No newline at end of file