diff --git a/src/config.cpp b/src/config.cpp index f918cc9b..22a88529 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -572,7 +572,7 @@ namespace config { true, // high resolution scrolling true, // native pen/touch support false, // enable input only mode - false, // enable_block_rumble_messages_to_controllers + true, // enable_rumble_messages_to_controllers }; sunshine_t sunshine { @@ -1289,7 +1289,7 @@ namespace config { bool_f(vars, "envvar_compatibility_mode", sunshine.envvar_compatibility_mode); bool_f(vars, "notify_pre_releases", sunshine.notify_pre_releases); bool_f(vars, "legacy_ordering", sunshine.legacy_ordering); - bool_f(vars, "enable_block_rumble_messages_to_controllers", input.enable_block_rumble_messages_to_controllers); + bool_f(vars, "enable_rumble_messages_to_controllers", input.enable_rumble_messages_to_controllers); int port = sunshine.port; int_between_f(vars, "port"s, port, {1024 + nvhttp::PORT_HTTPS, 65535 - rtsp_stream::RTSP_SETUP_PORT}); diff --git a/src/config.h b/src/config.h index 8429c1db..a3679695 100644 --- a/src/config.h +++ b/src/config.h @@ -212,7 +212,7 @@ namespace config { bool native_pen_touch; bool enable_input_only_mode; - bool enable_block_rumble_messages_to_controllers; + bool enable_rumble_messages_to_controllers; }; namespace flag { diff --git a/src/platform/windows/input.cpp b/src/platform/windows/input.cpp index 94713a2f..daf218d9 100644 --- a/src/platform/windows/input.cpp +++ b/src/platform/windows/input.cpp @@ -327,8 +327,8 @@ namespace platf { * @param smallMotor The small motor. */ void rumble(target_t::pointer target, std::uint8_t largeMotor, std::uint8_t smallMotor) { - // config::input.enable_block_rumble_messages_to_controllers - Default is false so ignore rumble messages when true - if( config::input.enable_block_rumble_messages_to_controllers == true ) { + // config::input.enable_rumble_messages_to_controllers - Default is true so ignore rumble messages when false + if( config::input.enable_rumble_messages_to_controllers == false ) { // Do nothing; just return return; } diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html index a9098288..c8c9511f 100644 --- a/src_assets/common/assets/web/config.html +++ b/src_assets/common/assets/web/config.html @@ -176,7 +176,7 @@ "high_resolution_scrolling": "enabled", "native_pen_touch": "enabled", "enable_input_only_mode": "disabled", - "enable_block_rumble_messages_to_controllers": "disabled", + "enable_rumble_messages_to_controllers": "enabled", "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI }, }, diff --git a/src_assets/common/assets/web/configs/tabs/Inputs.vue b/src_assets/common/assets/web/configs/tabs/Inputs.vue index 0083ca5c..e8487cbe 100644 --- a/src_assets/common/assets/web/configs/tabs/Inputs.vue +++ b/src_assets/common/assets/web/configs/tabs/Inputs.vue @@ -178,14 +178,14 @@ const config = ref(props.config) default="false" > - +