Browse Source
Merge pull request #13153 from german77/defaultset
service: set: Enable nfc and others by default and bump version
pull/15/merge
liamwhite
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
5 additions and
1 deletions
-
src/core/hle/service/set/setting_formats/system_settings.cpp
-
src/core/hle/service/set/system_settings_server.cpp
|
|
@ -52,6 +52,10 @@ SystemSettings DefaultSystemSettings() { |
|
|
settings.battery_percentage_flag = true; |
|
|
settings.battery_percentage_flag = true; |
|
|
settings.chinese_traditional_input_method = ChineseTraditionalInputMethod::Unknown0; |
|
|
settings.chinese_traditional_input_method = ChineseTraditionalInputMethod::Unknown0; |
|
|
settings.vibration_master_volume = 1.0f; |
|
|
settings.vibration_master_volume = 1.0f; |
|
|
|
|
|
settings.touch_screen_mode = TouchScreenMode::Standard; |
|
|
|
|
|
settings.nfc_enable_flag = true; |
|
|
|
|
|
settings.bluetooth_enable_flag = true; |
|
|
|
|
|
settings.wireless_lan_enable_flag = true; |
|
|
|
|
|
|
|
|
const auto language_code = |
|
|
const auto language_code = |
|
|
available_language_codes[static_cast<s32>(::Settings::values.language_index.GetValue())]; |
|
|
available_language_codes[static_cast<s32>(::Settings::values.language_index.GetValue())]; |
|
|
|
|
|
@ -26,7 +26,7 @@ |
|
|
namespace Service::Set { |
|
|
namespace Service::Set { |
|
|
|
|
|
|
|
|
namespace { |
|
|
namespace { |
|
|
constexpr u32 SETTINGS_VERSION{3u}; |
|
|
|
|
|
|
|
|
constexpr u32 SETTINGS_VERSION{4u}; |
|
|
constexpr auto SETTINGS_MAGIC = Common::MakeMagic('y', 'u', 'z', 'u', '_', 's', 'e', 't'); |
|
|
constexpr auto SETTINGS_MAGIC = Common::MakeMagic('y', 'u', 'z', 'u', '_', 's', 'e', 't'); |
|
|
struct SettingsHeader { |
|
|
struct SettingsHeader { |
|
|
u64 magic; |
|
|
u64 magic; |
|
|
|