Increase number of universals from 10 do 30

Train.cpp

@@ -465,6 +465,26 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = {
     {user_command::generictoggle7, &TTrain::OnCommand_generictoggle},
     {user_command::generictoggle8, &TTrain::OnCommand_generictoggle},
     {user_command::generictoggle9, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle10, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle11, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle12, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle13, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle14, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle15, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle16, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle17, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle18, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle19, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle20, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle21, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle22, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle23, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle24, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle25, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle26, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle27, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle28, &TTrain::OnCommand_generictoggle},
+    {user_command::generictoggle29, &TTrain::OnCommand_generictoggle},
     { user_command::vehiclemoveforwards, &TTrain::OnCommand_vehiclemoveforwards },
     { user_command::vehiclemovebackwards, &TTrain::OnCommand_vehiclemovebackwards },
     { user_command::vehicleboost, &TTrain::OnCommand_vehicleboost },
@@ -10624,6 +10644,26 @@ bool TTrain::initialize_gauge(cParser &Parser, std::string const &Label, int con
 	    {"universal7:", ggUniversals[7]},
 	    {"universal8:", ggUniversals[8]},
 	    {"universal9:", ggUniversals[9]},
+	    {"universal10:", ggUniversals[10]},
+	    {"universal11:", ggUniversals[11]},
+	    {"universal12:", ggUniversals[12]},
+	    {"universal13:", ggUniversals[13]},
+	    {"universal14:", ggUniversals[14]},
+	    {"universal15:", ggUniversals[15]},
+	    {"universal16:", ggUniversals[16]},
+	    {"universal17:", ggUniversals[17]},
+	    {"universal18:", ggUniversals[18]},
+	    {"universal19:", ggUniversals[19]},
+	    {"universal20:", ggUniversals[20]},
+	    {"universal21:", ggUniversals[21]},
+	    {"universal22:", ggUniversals[22]},
+	    {"universal23:", ggUniversals[23]},
+	    {"universal24:", ggUniversals[24]},
+	    {"universal25:", ggUniversals[25]},
+	    {"universal26:", ggUniversals[26]},
+	    {"universal27:", ggUniversals[27]},
+	    {"universal28:", ggUniversals[28]},
+	    {"universal29:", ggUniversals[29]},
 		{ "inverterenable1_bt:", ggInverterEnableButtons[0] },
 		{ "inverterenable2_bt:", ggInverterEnableButtons[1] },
 		{ "inverterenable3_bt:", ggInverterEnableButtons[2] },

Train.h

@@ -620,7 +620,7 @@ public: // reszta może by?publiczna
 	TGauge ggSpeedControlPowerDecreaseButton;
 	std::array<TGauge, 10> ggSpeedCtrlButtons; // NOTE: temporary arrangement until we have dynamically built control table
 
-   std::array<TGauge, 10> ggUniversals; // NOTE: temporary arrangement until we have dynamically built control table
+   std::array<TGauge, 30> ggUniversals; // NOTE: temporary arrangement until we have dynamically built control table
    std::array<TGauge, 3> ggRelayResetButtons; // NOTE: temporary arrangement until we have dynamically built control table
    std::array<TGauge, 12> ggInverterEnableButtons; // NOTE: temporary arrangement until we have dynamically built control table
    std::array<TGauge, 12> ggInverterDisableButtons; // NOTE: temporary arrangement until we have dynamically built control table

command.cpp

@@ -278,6 +278,26 @@ commanddescription_sequence Commands_descriptions = {
     {"generictoggle7", command_target::vehicle, command_mode::oneoff},
     {"generictoggle8", command_target::vehicle, command_mode::oneoff},
     {"generictoggle9", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle10", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle11", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle12", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle13", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle14", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle15", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle16", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle17", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle18", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle19", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle20", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle21", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle22", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle23", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle24", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle25", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle26", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle27", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle28", command_target::vehicle, command_mode::oneoff},
+    {"generictoggle29", command_target::vehicle, command_mode::oneoff},
 	{ "batterytoggle", command_target::vehicle, command_mode::oneoff },
 	{ "batteryenable", command_target::vehicle, command_mode::oneoff },
 	{ "batterydisable", command_target::vehicle, command_mode::oneoff },
@@ -635,6 +655,27 @@ std::unordered_map<std::string, user_command> commandMap = {
     {"generictoggle7", user_command::generictoggle7},
     {"generictoggle8", user_command::generictoggle8},
     {"generictoggle9", user_command::generictoggle9},
+    {"generictoggle10", user_command::generictoggle10},
+    {"generictoggle11", user_command::generictoggle11},
+    {"generictoggle12", user_command::generictoggle12},
+    {"generictoggle13", user_command::generictoggle13},
+    {"generictoggle14", user_command::generictoggle14},
+    {"generictoggle15", user_command::generictoggle15},
+    {"generictoggle16", user_command::generictoggle16},
+    {"generictoggle17", user_command::generictoggle17},
+    {"generictoggle18", user_command::generictoggle18},
+    {"generictoggle19", user_command::generictoggle19},
+    {"generictoggle20", user_command::generictoggle20},
+    {"generictoggle21", user_command::generictoggle21},
+    {"generictoggle22", user_command::generictoggle22},
+    {"generictoggle23", user_command::generictoggle23},
+    {"generictoggle24", user_command::generictoggle24},
+    {"generictoggle25", user_command::generictoggle25},
+    {"generictoggle26", user_command::generictoggle26},
+    {"generictoggle27", user_command::generictoggle27},
+    {"generictoggle28", user_command::generictoggle28},
+    {"generictoggle29", user_command::generictoggle29},
+
 	{"batterytoggle", user_command::batterytoggle},
 	{"batteryenable", user_command::batteryenable},
 	{"batterydisable", user_command::batterydisable},

command.h

@@ -265,6 +265,7 @@ enum class user_command
 	timetablelighttoggle,
 	timetablelightenable,
 	timetablelightdisable,
+
 	generictoggle0,
 	generictoggle1,
 	generictoggle2,
@@ -275,6 +276,27 @@ enum class user_command
 	generictoggle7,
 	generictoggle8,
 	generictoggle9,
+	generictoggle10,
+	generictoggle11,
+	generictoggle12,
+	generictoggle13,
+	generictoggle14,
+	generictoggle15,
+	generictoggle16,
+	generictoggle17,
+	generictoggle18,
+	generictoggle19,
+	generictoggle20,
+	generictoggle21,
+	generictoggle22,
+	generictoggle23,
+	generictoggle24,
+	generictoggle25,
+	generictoggle26,
+	generictoggle27,
+	generictoggle28,
+	generictoggle29,
+
 	batterytoggle,
 	batteryenable,
 	batterydisable,

drivermouseinput.cpp

@@ -935,36 +935,36 @@ drivermouse_input::default_bindings() {
 		{ "couplingdisconnectback_sw:",{
 			user_command::occupiedcarcouplingdisconnectback,
 			user_command::none } },
-        { "universal0:", {
+	    {"universal0:", {user_command::generictoggle0, user_command::none}},
-            user_command::generictoggle0,
+	    {"universal1:", {user_command::generictoggle1, user_command::none}},
-            user_command::none } },
+	    {"universal2:", {user_command::generictoggle2, user_command::none}},
-        { "universal1:", {
+	    {"universal3:", {user_command::generictoggle3, user_command::none}},
-            user_command::generictoggle1,
+	    {"universal4:", {user_command::generictoggle4, user_command::none}},
-            user_command::none } },
+	    {"universal5:", {user_command::generictoggle5, user_command::none}},
-        { "universal2:", {
+	    {"universal6:", {user_command::generictoggle6, user_command::none}},
-            user_command::generictoggle2,
+	    {"universal7:", {user_command::generictoggle7, user_command::none}},
-            user_command::none } },
+	    {"universal8:", {user_command::generictoggle8, user_command::none}},
-        { "universal3:", {
+	    {"universal9:", {user_command::generictoggle9, user_command::none}},
-            user_command::generictoggle3,
+	    {"universal10:", {user_command::generictoggle10, user_command::none}},
-            user_command::none } },
+	    {"universal11:", {user_command::generictoggle11, user_command::none}},
-        { "universal4:", {
+	    {"universal12:", {user_command::generictoggle12, user_command::none}},
-            user_command::generictoggle4,
+	    {"universal13:", {user_command::generictoggle13, user_command::none}},
-            user_command::none } },
+	    {"universal14:", {user_command::generictoggle14, user_command::none}},
-        { "universal5:", {
+	    {"universal15:", {user_command::generictoggle15, user_command::none}},
-            user_command::generictoggle5,
+	    {"universal16:", {user_command::generictoggle16, user_command::none}},
-            user_command::none } },
+	    {"universal17:", {user_command::generictoggle17, user_command::none}},
-        { "universal6:", {
+	    {"universal18:", {user_command::generictoggle18, user_command::none}},
-            user_command::generictoggle6,
+	    {"universal19:", {user_command::generictoggle19, user_command::none}},
-            user_command::none } },
+	    {"universal20:", {user_command::generictoggle20, user_command::none}},
-        { "universal7:", {
+	    {"universal21:", {user_command::generictoggle21, user_command::none}},
-            user_command::generictoggle7,
+	    {"universal22:", {user_command::generictoggle22, user_command::none}},
-            user_command::none } },
+	    {"universal23:", {user_command::generictoggle23, user_command::none}},
-        { "universal8:", {
+	    {"universal24:", {user_command::generictoggle24, user_command::none}},
-            user_command::generictoggle8,
+	    {"universal25:", {user_command::generictoggle25, user_command::none}},
-            user_command::none } },
+	    {"universal26:", {user_command::generictoggle26, user_command::none}},
-        { "universal9:", {
+	    {"universal27:", {user_command::generictoggle27, user_command::none}},
-            user_command::generictoggle9,
+	    {"universal28:", {user_command::generictoggle28, user_command::none}},
-            user_command::none } },
+	    {"universal29:", {user_command::generictoggle29, user_command::none}},
 		{ "speedinc_bt:",{
 			user_command::speedcontrolincrease,
 			user_command::none } },