mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-19 07:36:02 +01:00
Merge branch 'master' into feat/renderers-cleanup
This commit is contained in:
@@ -158,6 +158,9 @@ commanddescription_sequence Commands_descriptions = {
|
||||
{"radiovolumeincrease", command_target::vehicle, command_mode::oneoff},
|
||||
{"radiovolumedecrease", command_target::vehicle, command_mode::oneoff},
|
||||
{"radiovolumeset", command_target::vehicle, command_mode::oneoff},
|
||||
{"radiofusetoggle", command_target::vehicle, command_mode::oneoff},
|
||||
{"radiofuseenable", command_target::vehicle, command_mode::oneoff},
|
||||
{"radiofusedisable", command_target::vehicle, command_mode::oneoff},
|
||||
{"cabchangeforward", command_target::vehicle, command_mode::oneoff},
|
||||
{"cabchangebackward", command_target::vehicle, command_mode::oneoff},
|
||||
{"modernlightdimmerdecrease", command_target::vehicle, command_mode::oneoff},
|
||||
@@ -413,6 +416,12 @@ commanddescription_sequence Commands_descriptions = {
|
||||
{"fmradiotunedecrease", command_target::vehicle, command_mode::oneoff},
|
||||
{"fmradiotuneset", command_target::vehicle, command_mode::oneoff},
|
||||
{"oilfuelpumptoggle", command_target::vehicle, command_mode::oneoff},
|
||||
{"linebreakertoggleb", command_target::vehicle, command_mode::oneoff},
|
||||
{"linebreakeropenb", command_target::vehicle, command_mode::oneoff},
|
||||
{"linebreakercloseb", command_target::vehicle, command_mode::oneoff},
|
||||
{"linebreakertogglec", command_target::vehicle, command_mode::oneoff},
|
||||
{"linebreakeropenc", command_target::vehicle, command_mode::oneoff},
|
||||
{"linebreakerclosec", command_target::vehicle, command_mode::oneoff},
|
||||
};
|
||||
|
||||
// Maps of command and coresponding strings
|
||||
@@ -551,6 +560,9 @@ std::unordered_map<std::string, user_command> const commandMap = {
|
||||
{"radiovolumeincrease", user_command::radiovolumeincrease},
|
||||
{"radiovolumedecrease", user_command::radiovolumedecrease},
|
||||
{"radiovolumeset", user_command::radiovolumeset},
|
||||
{"radiofusetoggle", user_command::radiofusetoggle},
|
||||
{"radiofuseenable", user_command::radiofuseenable},
|
||||
{"radiofusedisable", user_command::radiofusedisable},
|
||||
{"cabchangeforward", user_command::cabchangeforward},
|
||||
{"cabchangebackward", user_command::cabchangebackward},
|
||||
{"viewturn", user_command::viewturn},
|
||||
@@ -805,6 +817,12 @@ std::unordered_map<std::string, user_command> const commandMap = {
|
||||
{"fmradiotunedecrease", user_command::fmradiotunedecrease},
|
||||
{"fmradiotuneset", user_command::fmradiotuneset},
|
||||
{"oilfuelpumptoggle", user_command::oilfuelpumptoggle},
|
||||
{"linebreakertoggleb", user_command::linebreakertoggleb},
|
||||
{"linebreakeropenb", user_command::linebreakeropenb},
|
||||
{"linebreakercloseb", user_command::linebreakercloseb},
|
||||
{"linebreakertogglec", user_command::linebreakertogglec},
|
||||
{"linebreakeropenc", user_command::linebreakeropenc},
|
||||
{"linebreakerclosec", user_command::linebreakerclosec},
|
||||
{"none", user_command::none}};
|
||||
|
||||
} // namespace simulation
|
||||
|
||||
@@ -151,6 +151,9 @@ enum class user_command
|
||||
radiovolumeincrease,
|
||||
radiovolumedecrease,
|
||||
radiovolumeset,
|
||||
radiofusetoggle,
|
||||
radiofuseenable,
|
||||
radiofusedisable,
|
||||
cabchangeforward,
|
||||
cabchangebackward,
|
||||
|
||||
@@ -411,6 +414,12 @@ enum class user_command
|
||||
fmradiotunedecrease,
|
||||
fmradiotuneset,
|
||||
oilfuelpumptoggle,
|
||||
linebreakertoggleb,
|
||||
linebreakeropenb,
|
||||
linebreakercloseb,
|
||||
linebreakertogglec,
|
||||
linebreakeropenc,
|
||||
linebreakerclosec,
|
||||
none = -1
|
||||
};
|
||||
|
||||
|
||||
@@ -160,6 +160,9 @@ driverkeyboard_input::default_bindings() {
|
||||
// radiovolumeincrease,
|
||||
// radiovolumedecrease,
|
||||
// radiovolumeset,
|
||||
// radiofusetoggle,
|
||||
// radiofuseenable,
|
||||
// radiofusedisable,
|
||||
{ cabchangeforward, {GLFW_KEY_HOME, ""} },
|
||||
{ cabchangebackward, {GLFW_KEY_END, ""} },
|
||||
// viewturn,
|
||||
|
||||
@@ -597,6 +597,18 @@ drivermouse_input::default_bindings() {
|
||||
{ "main_on_bt:",{
|
||||
linebreakerclose,
|
||||
none } },
|
||||
{ "mainb_off_bt:", {
|
||||
linebreakeropenb,
|
||||
none } },
|
||||
{ "mainb_on_bt:", {
|
||||
linebreakercloseb,
|
||||
none } },
|
||||
{ "mainc_off_bt:", {
|
||||
linebreakeropenc,
|
||||
none } },
|
||||
{ "mainc_on_bt:", {
|
||||
linebreakerclosec,
|
||||
none } },
|
||||
{ "security_reset_bt:", {
|
||||
alerteracknowledge,
|
||||
none } },
|
||||
@@ -774,6 +786,12 @@ drivermouse_input::default_bindings() {
|
||||
{ "main_sw:", {
|
||||
linebreakertoggle,
|
||||
none } },
|
||||
{ "mainb_sw:", {
|
||||
linebreakertoggleb,
|
||||
none } },
|
||||
{ "mainc_sw:", {
|
||||
linebreakertogglec,
|
||||
none } },
|
||||
{ "radio_sw:", {
|
||||
radiotoggle,
|
||||
none } },
|
||||
@@ -783,6 +801,15 @@ drivermouse_input::default_bindings() {
|
||||
{ "radiooff_sw:", {
|
||||
radiodisable,
|
||||
none } },
|
||||
{ "radiofuse_sw:", {
|
||||
radiofusetoggle,
|
||||
none } },
|
||||
{ "radiofuseon_sw:", {
|
||||
radiofuseenable,
|
||||
none } },
|
||||
{ "radiofuseoff_sw:", {
|
||||
radiofusedisable,
|
||||
none } },
|
||||
{ "radiochannel_sw:", {
|
||||
radiochannelincrease,
|
||||
radiochanneldecrease } },
|
||||
|
||||
Reference in New Issue
Block a user