From 2044ae6b3af6fab4d79996a661fef43f6db8d825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Mon, 15 Jan 2024 23:26:53 +0000 Subject: [PATCH 1/4] Fix more typos --- .../java/org/yuzu/yuzu_emu/utils/FileUtil.kt | 2 +- .../app/src/main/jni/native_config.cpp | 2 +- .../app/src/main/res/values/strings.xml | 2 +- src/audio_core/adsp/adsp.cpp | 2 +- .../renderer/command/command_generator.cpp | 12 +++---- src/audio_core/renderer/mix/mix_info.cpp | 2 +- .../renderer/splitter/splitter_context.cpp | 2 +- .../renderer/splitter/splitter_context.h | 2 +- src/common/settings_common.cpp | 2 +- src/common/settings_common.h | 2 +- src/hid_core/frontend/emulated_controller.cpp | 32 +++++++++---------- src/hid_core/frontend/emulated_controller.h | 2 +- src/hid_core/frontend/motion_input.h | 4 +-- src/hid_core/hid_result.h | 2 +- src/hid_core/irsensor/irs_types.h | 4 +-- .../resources/hid_firmware_settings.cpp | 4 +-- .../resources/hid_firmware_settings.h | 2 +- src/hid_core/resources/six_axis/six_axis.cpp | 4 +-- src/hid_core/resources/six_axis/six_axis.h | 2 +- src/input_common/drivers/gc_adapter.cpp | 4 +-- .../helpers/joycon_protocol/irs.cpp | 4 +-- .../helpers/joycon_protocol/joycon_types.h | 6 ++-- .../helpers/joycon_protocol/nfc.cpp | 8 ++--- .../helpers/joycon_protocol/rumble.cpp | 12 +++---- src/input_common/helpers/udp_protocol.h | 2 +- src/network/room_member.cpp | 2 +- src/network/room_member.h | 2 +- .../backend/glsl/glsl_emit_context.cpp | 4 +-- src/yuzu/applets/qt_amiibo_settings.cpp | 4 +-- src/yuzu/applets/qt_amiibo_settings.h | 2 +- src/yuzu/bootmanager.h | 2 +- .../configure_input_player_widget.cpp | 24 +++++++------- src/yuzu/configuration/configure_system.cpp | 2 +- src/yuzu/configuration/shared_widget.cpp | 4 +-- src/yuzu/multiplayer/chat_room.cpp | 2 +- src/yuzu_cmd/yuzu.cpp | 2 +- 36 files changed, 86 insertions(+), 86 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt index 132f002fb..b54a19c65 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/utils/FileUtil.kt @@ -104,7 +104,7 @@ object FileUtil { /** * Reference: https://stackoverflow.com/questions/42186820/documentfile-is-very-slow - * This function will be faster than DoucmentFile.listFiles + * This function will be faster than DocumentFile.listFiles * @param uri Directory uri. * @return CheapDocument lists. */ diff --git a/src/android/app/src/main/jni/native_config.cpp b/src/android/app/src/main/jni/native_config.cpp index 535902483..c6c3343dc 100644 --- a/src/android/app/src/main/jni/native_config.cpp +++ b/src/android/app/src/main/jni/native_config.cpp @@ -205,7 +205,7 @@ jboolean Java_org_yuzu_yuzu_1emu_utils_NativeConfig_getIsRuntimeModifiable(JNIEn jstring jkey) { auto setting = getSetting(env, jkey); if (setting != nullptr) { - return setting->RuntimeModfiable(); + return setting->RuntimeModifiable(); } return true; } diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml index 3bb92ad67..547752bda 100644 --- a/src/android/app/src/main/res/values/strings.xml +++ b/src/android/app/src/main/res/values/strings.xml @@ -410,7 +410,7 @@ 日本語 English Français - Deutsch + Deutsch Italiano Español 简体中文 diff --git a/src/audio_core/adsp/adsp.cpp b/src/audio_core/adsp/adsp.cpp index 6c53c98fd..48f0a63d4 100644 --- a/src/audio_core/adsp/adsp.cpp +++ b/src/audio_core/adsp/adsp.cpp @@ -11,7 +11,7 @@ ADSP::ADSP(Core::System& system, Sink::Sink& sink) { opus_decoder = std::make_unique(system); opus_decoder->Send(Direction::DSP, OpusDecoder::Message::Start); if (opus_decoder->Receive(Direction::Host) != OpusDecoder::Message::StartOK) { - LOG_ERROR(Service_Audio, "OpusDeocder failed to initialize."); + LOG_ERROR(Service_Audio, "OpusDecoder failed to initialize."); return; } } diff --git a/src/audio_core/renderer/command/command_generator.cpp b/src/audio_core/renderer/command/command_generator.cpp index ccb186209..f97db5899 100644 --- a/src/audio_core/renderer/command/command_generator.cpp +++ b/src/audio_core/renderer/command/command_generator.cpp @@ -41,7 +41,7 @@ void CommandGenerator::GenerateDataSourceCommand(VoiceInfo& voice_info, const VoiceState& voice_state, const s8 channel) { if (voice_info.mix_id == UnusedMixId) { if (voice_info.splitter_id != UnusedSplitterId) { - auto destination{splitter_context.GetDesintationData(voice_info.splitter_id, 0)}; + auto destination{splitter_context.GetDestinationData(voice_info.splitter_id, 0)}; u32 dest_id{0}; while (destination != nullptr) { if (destination->IsConfigured()) { @@ -55,7 +55,7 @@ void CommandGenerator::GenerateDataSourceCommand(VoiceInfo& voice_info, } } dest_id++; - destination = splitter_context.GetDesintationData(voice_info.splitter_id, dest_id); + destination = splitter_context.GetDestinationData(voice_info.splitter_id, dest_id); } } } else { @@ -234,7 +234,7 @@ void CommandGenerator::GenerateVoiceCommand(VoiceInfo& voice_info) { if (voice_info.mix_id == UnusedMixId) { if (voice_info.splitter_id != UnusedSplitterId) { auto i{channel}; - auto destination{splitter_context.GetDesintationData(voice_info.splitter_id, i)}; + auto destination{splitter_context.GetDestinationData(voice_info.splitter_id, i)}; while (destination != nullptr) { if (destination->IsConfigured()) { const auto mix_id{destination->GetMixId()}; @@ -249,7 +249,7 @@ void CommandGenerator::GenerateVoiceCommand(VoiceInfo& voice_info) { } } i += voice_info.channel_count; - destination = splitter_context.GetDesintationData(voice_info.splitter_id, i); + destination = splitter_context.GetDestinationData(voice_info.splitter_id, i); } } } else { @@ -591,7 +591,7 @@ void CommandGenerator::GenerateMixCommands(MixInfo& mix_info) { if (mix_info.dst_splitter_id != UnusedSplitterId) { s16 dest_id{0}; auto destination{ - splitter_context.GetDesintationData(mix_info.dst_splitter_id, dest_id)}; + splitter_context.GetDestinationData(mix_info.dst_splitter_id, dest_id)}; while (destination != nullptr) { if (destination->IsConfigured()) { auto splitter_mix_id{destination->GetMixId()}; @@ -612,7 +612,7 @@ void CommandGenerator::GenerateMixCommands(MixInfo& mix_info) { } dest_id++; destination = - splitter_context.GetDesintationData(mix_info.dst_splitter_id, dest_id); + splitter_context.GetDestinationData(mix_info.dst_splitter_id, dest_id); } } } else { diff --git a/src/audio_core/renderer/mix/mix_info.cpp b/src/audio_core/renderer/mix/mix_info.cpp index 5e44bde18..68bbe0aed 100644 --- a/src/audio_core/renderer/mix/mix_info.cpp +++ b/src/audio_core/renderer/mix/mix_info.cpp @@ -93,7 +93,7 @@ bool MixInfo::UpdateConnection(EdgeMatrix& edge_matrix, const InParameter& in_pa for (u32 i = 0; i < destination_count; i++) { auto destination{ - splitter_context.GetDesintationData(in_params.dest_splitter_id, i)}; + splitter_context.GetDestinationData(in_params.dest_splitter_id, i)}; if (destination) { const auto destination_id{destination->GetMixId()}; diff --git a/src/audio_core/renderer/splitter/splitter_context.cpp b/src/audio_core/renderer/splitter/splitter_context.cpp index 686150ea6..d0f3b60c2 100644 --- a/src/audio_core/renderer/splitter/splitter_context.cpp +++ b/src/audio_core/renderer/splitter/splitter_context.cpp @@ -9,7 +9,7 @@ namespace AudioCore::Renderer { -SplitterDestinationData* SplitterContext::GetDesintationData(const s32 splitter_id, +SplitterDestinationData* SplitterContext::GetDestinationData(const s32 splitter_id, const s32 destination_id) { return splitter_infos[splitter_id].GetData(destination_id); } diff --git a/src/audio_core/renderer/splitter/splitter_context.h b/src/audio_core/renderer/splitter/splitter_context.h index 556e6dcc3..1c0b84671 100644 --- a/src/audio_core/renderer/splitter/splitter_context.h +++ b/src/audio_core/renderer/splitter/splitter_context.h @@ -42,7 +42,7 @@ public: * @param destination_id - Destination index within the splitter. * @return Pointer to the found destination. May be nullptr. */ - SplitterDestinationData* GetDesintationData(s32 splitter_id, s32 destination_id); + SplitterDestinationData* GetDestinationData(s32 splitter_id, s32 destination_id); /** * Get a splitter from the given index. diff --git a/src/common/settings_common.cpp b/src/common/settings_common.cpp index 5960b78aa..b90e3509c 100644 --- a/src/common/settings_common.cpp +++ b/src/common/settings_common.cpp @@ -35,7 +35,7 @@ bool BasicSetting::Save() const { return save; } -bool BasicSetting::RuntimeModfiable() const { +bool BasicSetting::RuntimeModifiable() const { return runtime_modifiable; } diff --git a/src/common/settings_common.h b/src/common/settings_common.h index 1a290ad77..987489e8a 100644 --- a/src/common/settings_common.h +++ b/src/common/settings_common.h @@ -186,7 +186,7 @@ public: /** * @returns true if the current setting can be changed while the guest is running. */ - [[nodiscard]] bool RuntimeModfiable() const; + [[nodiscard]] bool RuntimeModifiable() const; /** * @returns A unique number corresponding to the setting. diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index 3d2d1e9f9..3f36be367 100644 --- a/src/hid_core/frontend/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp @@ -509,11 +509,11 @@ void EmulatedController::ReloadInput() { }); } turbo_button_state = 0; - is_initalized = true; + is_initialized = true; } void EmulatedController::UnloadInput() { - is_initalized = false; + is_initialized = false; for (auto& button : button_devices) { button.reset(); } @@ -1209,7 +1209,7 @@ void EmulatedController::SetNfc(const Common::Input::CallbackStatus& callback) { } bool EmulatedController::SetVibration(std::size_t device_index, VibrationValue vibration) { - if (!is_initalized) { + if (!is_initialized) { return false; } if (device_index >= output_devices.size()) { @@ -1247,7 +1247,7 @@ bool EmulatedController::IsVibrationEnabled(std::size_t device_index) { const auto player_index = Service::HID::NpadIdTypeToIndex(npad_id_type); const auto& player = Settings::values.players.GetValue()[player_index]; - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1270,7 +1270,7 @@ Common::Input::DriverResult EmulatedController::SetPollingMode( EmulatedDeviceIndex device_index, Common::Input::PollingMode polling_mode) { LOG_INFO(Service_HID, "Set polling mode {}, device_index={}", polling_mode, device_index); - if (!is_initalized) { + if (!is_initialized) { return Common::Input::DriverResult::InvalidHandle; } @@ -1319,7 +1319,7 @@ bool EmulatedController::SetCameraFormat( Core::IrSensor::ImageTransferProcessorFormat camera_format) { LOG_INFO(Service_HID, "Set camera format {}", camera_format); - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1347,7 +1347,7 @@ void EmulatedController::SetRingParam(Common::ParamPackage param) { bool EmulatedController::HasNfc() const { - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1388,7 +1388,7 @@ bool EmulatedController::RemoveNfcHandle() { } bool EmulatedController::StartNfcPolling() { - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1403,7 +1403,7 @@ bool EmulatedController::StartNfcPolling() { } bool EmulatedController::StopNfcPolling() { - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1418,7 +1418,7 @@ bool EmulatedController::StopNfcPolling() { } bool EmulatedController::ReadAmiiboData(std::vector& data) { - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1434,7 +1434,7 @@ bool EmulatedController::ReadAmiiboData(std::vector& data) { bool EmulatedController::ReadMifareData(const Common::Input::MifareRequest& request, Common::Input::MifareRequest& out_data) { - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1450,7 +1450,7 @@ bool EmulatedController::ReadMifareData(const Common::Input::MifareRequest& requ } bool EmulatedController::WriteMifareData(const Common::Input::MifareRequest& request) { - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1465,7 +1465,7 @@ bool EmulatedController::WriteMifareData(const Common::Input::MifareRequest& req } bool EmulatedController::WriteNfc(const std::vector& data) { - if (!is_initalized) { + if (!is_initialized) { return false; } @@ -1480,7 +1480,7 @@ bool EmulatedController::WriteNfc(const std::vector& data) { } void EmulatedController::SetLedPattern() { - if (!is_initalized) { + if (!is_initialized) { return; } @@ -1508,8 +1508,8 @@ void EmulatedController::SetGyroscopeZeroDriftMode(GyroscopeZeroDriftMode mode) motion.emulated.SetGyroThreshold(motion.emulated.ThresholdLoose); break; case GyroscopeZeroDriftMode::Tight: - motion_sensitivity = motion.emulated.IsAtRestThight; - motion.emulated.SetGyroThreshold(motion.emulated.ThresholdThight); + motion_sensitivity = motion.emulated.IsAtRestTight; + motion.emulated.SetGyroThreshold(motion.emulated.ThresholdTight); break; case GyroscopeZeroDriftMode::Standard: default: diff --git a/src/hid_core/frontend/emulated_controller.h b/src/hid_core/frontend/emulated_controller.h index 94798164d..90e536e07 100644 --- a/src/hid_core/frontend/emulated_controller.h +++ b/src/hid_core/frontend/emulated_controller.h @@ -559,7 +559,7 @@ private: NpadStyleTag supported_style_tag{NpadStyleSet::All}; bool is_connected{false}; bool is_configuring{false}; - bool is_initalized{false}; + bool is_initialized{false}; bool system_buttons_enabled{true}; f32 motion_sensitivity{Core::HID::MotionInput::IsAtRestStandard}; u32 turbo_button_state{0}; diff --git a/src/hid_core/frontend/motion_input.h b/src/hid_core/frontend/motion_input.h index 11678983d..c902a3a6e 100644 --- a/src/hid_core/frontend/motion_input.h +++ b/src/hid_core/frontend/motion_input.h @@ -13,12 +13,12 @@ class MotionInput { public: static constexpr float ThresholdLoose = 0.01f; static constexpr float ThresholdStandard = 0.007f; - static constexpr float ThresholdThight = 0.002f; + static constexpr float ThresholdTight = 0.002f; static constexpr float IsAtRestRelaxed = 0.05f; static constexpr float IsAtRestLoose = 0.02f; static constexpr float IsAtRestStandard = 0.01f; - static constexpr float IsAtRestThight = 0.005f; + static constexpr float IsAtRestTight = 0.005f; static constexpr float GyroMaxValue = 5.0f; static constexpr float AccelMaxValue = 7.0f; diff --git a/src/hid_core/hid_result.h b/src/hid_core/hid_result.h index bb14aa61e..df9b28c9a 100644 --- a/src/hid_core/hid_result.h +++ b/src/hid_core/hid_result.h @@ -15,7 +15,7 @@ constexpr Result ResultVibrationNotInitialized{ErrorModule::HID, 121}; constexpr Result ResultVibrationInvalidStyleIndex{ErrorModule::HID, 122}; constexpr Result ResultVibrationInvalidNpadId{ErrorModule::HID, 123}; constexpr Result ResultVibrationDeviceIndexOutOfRange{ErrorModule::HID, 124}; -constexpr Result ResultVibrationStrenghtOutOfRange{ErrorModule::HID, 126}; +constexpr Result ResultVibrationStrengthOutOfRange{ErrorModule::HID, 126}; constexpr Result ResultVibrationArraySizeMismatch{ErrorModule::HID, 131}; constexpr Result InvalidSixAxisFusionRange{ErrorModule::HID, 423}; diff --git a/src/hid_core/irsensor/irs_types.h b/src/hid_core/irsensor/irs_types.h index 017f38e6c..d7354de21 100644 --- a/src/hid_core/irsensor/irs_types.h +++ b/src/hid_core/irsensor/irs_types.h @@ -106,8 +106,8 @@ enum class HandAnalysisMode : u32 { None, Silhouette, Image, - SilhoueteAndImage, - SilhuetteOnly, + SilhouetteAndImage, + SilhouetteOnly, }; // This is nn::irsensor::IrSensorFunctionLevel diff --git a/src/hid_core/resources/hid_firmware_settings.cpp b/src/hid_core/resources/hid_firmware_settings.cpp index e76b3a016..9fa0db17e 100644 --- a/src/hid_core/resources/hid_firmware_settings.cpp +++ b/src/hid_core/resources/hid_firmware_settings.cpp @@ -14,7 +14,7 @@ void HidFirmwareSettings::Reload() { } void HidFirmwareSettings::LoadSettings(bool reload_config) { - if (is_initalized && !reload_config) { + if (is_initialized && !reload_config) { return; } @@ -33,7 +33,7 @@ void HidFirmwareSettings::LoadSettings(bool reload_config) { is_handheld_forced = true; features_per_id_disabled = {}; is_touch_firmware_auto_update_disabled = false; - is_initalized = true; + is_initialized = true; } bool HidFirmwareSettings::IsDebugPadEnabled() { diff --git a/src/hid_core/resources/hid_firmware_settings.h b/src/hid_core/resources/hid_firmware_settings.h index 6c10c440b..00201fd94 100644 --- a/src/hid_core/resources/hid_firmware_settings.h +++ b/src/hid_core/resources/hid_firmware_settings.h @@ -33,7 +33,7 @@ public: FeaturesPerId FeaturesDisabledPerId(); private: - bool is_initalized{}; + bool is_initialized{}; // Debug settings bool is_debug_pad_enabled{}; diff --git a/src/hid_core/resources/six_axis/six_axis.cpp b/src/hid_core/resources/six_axis/six_axis.cpp index 8a9677c50..404e4e6ca 100644 --- a/src/hid_core/resources/six_axis/six_axis.cpp +++ b/src/hid_core/resources/six_axis/six_axis.cpp @@ -249,7 +249,7 @@ Result SixAxis::EnableSixAxisSensorUnalteredPassthrough( } auto& sixaxis = GetSixaxisState(sixaxis_handle); - sixaxis.unaltered_passtrough = is_enabled; + sixaxis.unaltered_passthrough = is_enabled; return ResultSuccess; } @@ -262,7 +262,7 @@ Result SixAxis::IsSixAxisSensorUnalteredPassthroughEnabled( } const auto& sixaxis = GetSixaxisState(sixaxis_handle); - is_enabled = sixaxis.unaltered_passtrough; + is_enabled = sixaxis.unaltered_passthrough; return ResultSuccess; } diff --git a/src/hid_core/resources/six_axis/six_axis.h b/src/hid_core/resources/six_axis/six_axis.h index 1054e1b27..b4b00a441 100644 --- a/src/hid_core/resources/six_axis/six_axis.h +++ b/src/hid_core/resources/six_axis/six_axis.h @@ -62,7 +62,7 @@ private: struct SixaxisParameters { bool is_fusion_enabled{true}; - bool unaltered_passtrough{false}; + bool unaltered_passthrough{false}; Core::HID::SixAxisSensorFusionParameters fusion{}; Core::HID::SixAxisSensorCalibrationParameter calibration{}; Core::HID::SixAxisSensorIcInformation ic_information{}; diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp index 1ff296af5..f1184a5fa 100644 --- a/src/input_common/drivers/gc_adapter.cpp +++ b/src/input_common/drivers/gc_adapter.cpp @@ -451,11 +451,11 @@ ButtonMapping GCAdapter::GetButtonMappingForDevice(const Common::ParamPackage& p std::tuple{Settings::NativeButton::ZL, PadButton::TriggerL, PadAxes::TriggerLeft}, {Settings::NativeButton::ZR, PadButton::TriggerR, PadAxes::TriggerRight}, }; - for (const auto& [switch_button, gcadapter_buton, gcadapter_axis] : switch_to_gcadapter_axis) { + for (const auto& [switch_button, gcadapter_button, gcadapter_axis] : switch_to_gcadapter_axis) { Common::ParamPackage button_params{}; button_params.Set("engine", GetEngineName()); button_params.Set("port", params.Get("port", 0)); - button_params.Set("button", static_cast(gcadapter_buton)); + button_params.Set("button", static_cast(gcadapter_button)); button_params.Set("axis", static_cast(gcadapter_axis)); button_params.Set("threshold", 0.5f); button_params.Set("range", 1.9f); diff --git a/src/input_common/helpers/joycon_protocol/irs.cpp b/src/input_common/helpers/joycon_protocol/irs.cpp index 68b0589e3..5bf72114d 100644 --- a/src/input_common/helpers/joycon_protocol/irs.cpp +++ b/src/input_common/helpers/joycon_protocol/irs.cpp @@ -236,9 +236,9 @@ Common::Input::DriverResult IrsProtocol::WriteRegistersStep2() { .number_of_registers = 0x8, .registers = { - IrsRegister{IrRegistersAddress::LedIntensitiyMSB, + IrsRegister{IrRegistersAddress::LedIntensityMSB, static_cast(led_intensity >> 8)}, - {IrRegistersAddress::LedIntensitiyLSB, static_cast(led_intensity & 0xff)}, + {IrRegistersAddress::LedIntensityLSB, static_cast(led_intensity & 0xff)}, {IrRegistersAddress::ImageFlip, static_cast(image_flip)}, {IrRegistersAddress::DenoiseSmoothing, static_cast((denoise >> 16) & 0xff)}, {IrRegistersAddress::DenoiseEdge, static_cast((denoise >> 8) & 0xff)}, diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h index 77a43c67a..792f124e1 100644 --- a/src/input_common/helpers/joycon_protocol/joycon_types.h +++ b/src/input_common/helpers/joycon_protocol/joycon_types.h @@ -282,7 +282,7 @@ enum class NFCCommand : u8 { CancelAll = 0x00, StartPolling = 0x01, StopPolling = 0x02, - StartWaitingRecieve = 0x04, + StartWaitingReceive = 0x04, ReadNtag = 0x06, WriteNtag = 0x08, Mifare = 0x0F, @@ -382,8 +382,8 @@ enum class IrRegistersAddress : u16 { FinalizeConfig = 0x0700, LedFilter = 0x0e00, Leds = 0x1000, - LedIntensitiyMSB = 0x1100, - LedIntensitiyLSB = 0x1200, + LedIntensityMSB = 0x1100, + LedIntensityLSB = 0x1200, ImageFlip = 0x2d00, Resolution = 0x2e00, DigitalGainLSB = 0x2e01, diff --git a/src/input_common/helpers/joycon_protocol/nfc.cpp b/src/input_common/helpers/joycon_protocol/nfc.cpp index 09953394b..db83f9ef4 100644 --- a/src/input_common/helpers/joycon_protocol/nfc.cpp +++ b/src/input_common/helpers/joycon_protocol/nfc.cpp @@ -519,13 +519,13 @@ Common::Input::DriverResult NfcProtocol::GetMifareData( } if (output.mcu_report == MCUReport::NFCState && output.mcu_data[1] == 0x10) { - constexpr std::size_t DATA_LENGHT = 0x10 + 1; + constexpr std::size_t DATA_LENGTH = 0x10 + 1; constexpr std::size_t DATA_START = 11; const u8 number_of_elements = output.mcu_data[10]; for (std::size_t i = 0; i < number_of_elements; i++) { - out_data[i].sector = output.mcu_data[DATA_START + (i * DATA_LENGHT)]; + out_data[i].sector = output.mcu_data[DATA_START + (i * DATA_LENGTH)]; memcpy(out_data[i].data.data(), - output.mcu_data.data() + DATA_START + 1 + (i * DATA_LENGHT), + output.mcu_data.data() + DATA_START + 1 + (i * DATA_LENGTH), sizeof(MifareReadData::data)); } package_index++; @@ -659,7 +659,7 @@ Common::Input::DriverResult NfcProtocol::SendStopPollingRequest(MCUCommandRespon Common::Input::DriverResult NfcProtocol::SendNextPackageRequest(MCUCommandResponse& output, u8 packet_id) { NFCRequestState request{ - .command_argument = NFCCommand::StartWaitingRecieve, + .command_argument = NFCCommand::StartWaitingReceive, .block_id = {}, .packet_id = packet_id, .packet_flag = MCUPacketFlag::LastCommandPacket, diff --git a/src/input_common/helpers/joycon_protocol/rumble.cpp b/src/input_common/helpers/joycon_protocol/rumble.cpp index 7647f505e..9fd0b8470 100644 --- a/src/input_common/helpers/joycon_protocol/rumble.cpp +++ b/src/input_common/helpers/joycon_protocol/rumble.cpp @@ -67,7 +67,7 @@ u8 RumbleProtocol::EncodeHighAmplitude(f32 amplitude) const { // More information about these values can be found here: // https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/rumble_data_table.md - static constexpr std::array, 101> high_fequency_amplitude{ + static constexpr std::array, 101> high_frequency_amplitude{ std::pair{0.0f, 0x0}, {0.01f, 0x2}, {0.012f, 0x4}, @@ -171,20 +171,20 @@ u8 RumbleProtocol::EncodeHighAmplitude(f32 amplitude) const { {1.003f, 0xc8}, }; - for (const auto& [amplitude_value, code] : high_fequency_amplitude) { + for (const auto& [amplitude_value, code] : high_frequency_amplitude) { if (amplitude <= amplitude_value) { return static_cast(code); } } - return static_cast(high_fequency_amplitude[high_fequency_amplitude.size() - 1].second); + return static_cast(high_frequency_amplitude[high_frequency_amplitude.size() - 1].second); } u16 RumbleProtocol::EncodeLowAmplitude(f32 amplitude) const { // More information about these values can be found here: // https://github.com/dekuNukem/Nintendo_Switch_Reverse_Engineering/blob/master/rumble_data_table.md - static constexpr std::array, 101> high_fequency_amplitude{ + static constexpr std::array, 101> high_frequency_amplitude{ std::pair{0.0f, 0x0040}, {0.01f, 0x8040}, {0.012f, 0x0041}, @@ -288,13 +288,13 @@ u16 RumbleProtocol::EncodeLowAmplitude(f32 amplitude) const { {1.003f, 0x0072}, }; - for (const auto& [amplitude_value, code] : high_fequency_amplitude) { + for (const auto& [amplitude_value, code] : high_frequency_amplitude) { if (amplitude <= amplitude_value) { return static_cast(code); } } - return static_cast(high_fequency_amplitude[high_fequency_amplitude.size() - 1].second); + return static_cast(high_frequency_amplitude[high_frequency_amplitude.size() - 1].second); } } // namespace InputCommon::Joycon diff --git a/src/input_common/helpers/udp_protocol.h b/src/input_common/helpers/udp_protocol.h index d9643ffe0..dba9f87d9 100644 --- a/src/input_common/helpers/udp_protocol.h +++ b/src/input_common/helpers/udp_protocol.h @@ -78,7 +78,7 @@ namespace Request { enum RegisterFlags : u8 { AllPads, PadID, - PadMACAdddress, + PadMACAddress, }; struct Version {}; diff --git a/src/network/room_member.cpp b/src/network/room_member.cpp index b94cb24ad..a6845273c 100644 --- a/src/network/room_member.cpp +++ b/src/network/room_member.cpp @@ -724,7 +724,7 @@ RoomMember::CallbackHandle RoomMember::BindOnRoomInformationCha return room_member_impl->Bind(callback); } -RoomMember::CallbackHandle RoomMember::BindOnChatMessageRecieved( +RoomMember::CallbackHandle RoomMember::BindOnChatMessageReceived( std::function callback) { return room_member_impl->Bind(callback); } diff --git a/src/network/room_member.h b/src/network/room_member.h index 33ac18e72..37e9ea16a 100644 --- a/src/network/room_member.h +++ b/src/network/room_member.h @@ -254,7 +254,7 @@ public: * @param callback The function to call * @return A handle used for removing the function from the registered list */ - CallbackHandle BindOnChatMessageRecieved( + CallbackHandle BindOnChatMessageReceived( std::function callback); /** diff --git a/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp b/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp index b2ceeefc4..c5ac7b8f2 100644 --- a/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp +++ b/src/shader_recompiler/backend/glsl/glsl_emit_context.cpp @@ -608,8 +608,8 @@ std::string EmitContext::DefineGlobalMemoryFunctions() { const auto aligned_low_addr{fmt::format("{}&{}", addr_xy[0], ssbo_align_mask)}; const auto aligned_addr{fmt::format("uvec2({},{})", aligned_low_addr, addr_xy[1])}; const auto addr_pack{fmt::format("packUint2x32({})", aligned_addr)}; - const auto addr_statment{fmt::format("uint64_t {}={};", ssbo_addr, addr_pack)}; - func += addr_statment; + const auto addr_statement{fmt::format("uint64_t {}={};", ssbo_addr, addr_pack)}; + func += addr_statement; const auto size_vec{fmt::format("uvec2({},{})", size_xy[0], size_xy[1])}; const auto comp_lhs{fmt::format("(addr>={})", ssbo_addr)}; diff --git a/src/yuzu/applets/qt_amiibo_settings.cpp b/src/yuzu/applets/qt_amiibo_settings.cpp index b457a736a..b91796dde 100644 --- a/src/yuzu/applets/qt_amiibo_settings.cpp +++ b/src/yuzu/applets/qt_amiibo_settings.cpp @@ -36,7 +36,7 @@ QtAmiiboSettingsDialog::QtAmiiboSettingsDialog(QWidget* parent, QtAmiiboSettingsDialog::~QtAmiiboSettingsDialog() = default; int QtAmiiboSettingsDialog::exec() { - if (!is_initalized) { + if (!is_initialized) { return QDialog::Rejected; } return QDialog::exec(); @@ -66,7 +66,7 @@ void QtAmiiboSettingsDialog::LoadInfo() { QString::fromStdString(input_subsystem->GetVirtualAmiibo()->GetLastFilePath())); SetSettingsDescription(); - is_initalized = true; + is_initialized = true; } void QtAmiiboSettingsDialog::LoadAmiiboInfo() { diff --git a/src/yuzu/applets/qt_amiibo_settings.h b/src/yuzu/applets/qt_amiibo_settings.h index ee66a0255..3833cf6f2 100644 --- a/src/yuzu/applets/qt_amiibo_settings.h +++ b/src/yuzu/applets/qt_amiibo_settings.h @@ -58,7 +58,7 @@ private: Core::Frontend::CabinetParameters parameters; // If false amiibo settings failed to load - bool is_initalized{}; + bool is_initialized{}; }; class QtAmiiboSettings final : public QObject, public Core::Frontend::CabinetApplet { diff --git a/src/yuzu/bootmanager.h b/src/yuzu/bootmanager.h index 60edd464c..ae12b3481 100644 --- a/src/yuzu/bootmanager.h +++ b/src/yuzu/bootmanager.h @@ -170,7 +170,7 @@ public: void resizeEvent(QResizeEvent* event) override; - /// Converts a Qt keybard key into NativeKeyboard key + /// Converts a Qt keyboard key into NativeKeyboard key static int QtKeyToSwitchKey(Qt::Key qt_keys); /// Converts a Qt modifier keys into NativeKeyboard modifier keys diff --git a/src/yuzu/configuration/configure_input_player_widget.cpp b/src/yuzu/configuration/configure_input_player_widget.cpp index 19fdca7d3..8e1b5eb4b 100644 --- a/src/yuzu/configuration/configure_input_player_widget.cpp +++ b/src/yuzu/configuration/configure_input_player_widget.cpp @@ -845,12 +845,12 @@ void PlayerControlPreview::DrawProController(QPainter& p, const QPointF center) DrawSymbol(p, face_center + QPoint(-face_distance, 1), Symbol::Y, text_size); // D-pad buttons - const QPointF dpad_postion = center + QPoint(-61, 0); - DrawArrowButton(p, dpad_postion, Direction::Up, button_values[DUp]); - DrawArrowButton(p, dpad_postion, Direction::Left, button_values[DLeft]); - DrawArrowButton(p, dpad_postion, Direction::Right, button_values[DRight]); - DrawArrowButton(p, dpad_postion, Direction::Down, button_values[DDown]); - DrawArrowButtonOutline(p, dpad_postion); + const QPointF dpad_position = center + QPoint(-61, 0); + DrawArrowButton(p, dpad_position, Direction::Up, button_values[DUp]); + DrawArrowButton(p, dpad_position, Direction::Left, button_values[DLeft]); + DrawArrowButton(p, dpad_position, Direction::Right, button_values[DRight]); + DrawArrowButton(p, dpad_position, Direction::Down, button_values[DDown]); + DrawArrowButtonOutline(p, dpad_position); // ZL and ZR buttons p.setPen(colors.outline); @@ -935,13 +935,13 @@ void PlayerControlPreview::DrawGCController(QPainter& p, const QPointF center) { DrawSymbol(p, center + QPoint(100, -83), Symbol::Y, text_size); // D-pad buttons - const QPointF dpad_postion = center + QPoint(-61, 37); + const QPointF dpad_position = center + QPoint(-61, 37); const float dpad_size = 0.8f; - DrawArrowButton(p, dpad_postion, Direction::Up, button_values[DUp], dpad_size); - DrawArrowButton(p, dpad_postion, Direction::Left, button_values[DLeft], dpad_size); - DrawArrowButton(p, dpad_postion, Direction::Right, button_values[DRight], dpad_size); - DrawArrowButton(p, dpad_postion, Direction::Down, button_values[DDown], dpad_size); - DrawArrowButtonOutline(p, dpad_postion, dpad_size); + DrawArrowButton(p, dpad_position, Direction::Up, button_values[DUp], dpad_size); + DrawArrowButton(p, dpad_position, Direction::Left, button_values[DLeft], dpad_size); + DrawArrowButton(p, dpad_position, Direction::Right, button_values[DRight], dpad_size); + DrawArrowButton(p, dpad_position, Direction::Down, button_values[DDown], dpad_size); + DrawArrowButtonOutline(p, dpad_position, dpad_size); // Minus and Plus buttons p.setPen(colors.outline); diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp index 7cbf43775..b0b84f967 100644 --- a/src/yuzu/configuration/configure_system.cpp +++ b/src/yuzu/configuration/configure_system.cpp @@ -121,7 +121,7 @@ void ConfigureSystem::Setup(const ConfigurationShared::Builder& builder) { } if (setting->Id() == Settings::values.region_index.Id()) { - // Keep track of the region_index (and langauge_index) combobox to validate the selected + // Keep track of the region_index (and language_index) combobox to validate the selected // settings combo_region = widget->combobox; } else if (setting->Id() == Settings::values.language_index.Id()) { diff --git a/src/yuzu/configuration/shared_widget.cpp b/src/yuzu/configuration/shared_widget.cpp index 941683a43..85f4f7655 100644 --- a/src/yuzu/configuration/shared_widget.cpp +++ b/src/yuzu/configuration/shared_widget.cpp @@ -750,12 +750,12 @@ Widget::Widget(Settings::BasicSetting* setting_, const TranslationMap& translati } apply_funcs.push_back([load_func, setting_](bool powered_on) { - if (setting_->RuntimeModfiable() || !powered_on) { + if (setting_->RuntimeModifiable() || !powered_on) { load_func(); } }); - bool enable = runtime_lock || setting.RuntimeModfiable(); + bool enable = runtime_lock || setting.RuntimeModifiable(); if (setting.Switchable() && Settings::IsConfiguringGlobal() && !runtime_lock) { enable &= setting.UsingGlobal(); } diff --git a/src/yuzu/multiplayer/chat_room.cpp b/src/yuzu/multiplayer/chat_room.cpp index dec9696c1..4463616b4 100644 --- a/src/yuzu/multiplayer/chat_room.cpp +++ b/src/yuzu/multiplayer/chat_room.cpp @@ -206,7 +206,7 @@ void ChatRoom::Initialize(Network::RoomNetwork* room_network_) { room_network = room_network_; // setup the callbacks for network updates if (auto member = room_network->GetRoomMember().lock()) { - member->BindOnChatMessageRecieved( + member->BindOnChatMessageReceived( [this](const Network::ChatEntry& chat) { emit ChatReceived(chat); }); member->BindOnStatusMessageReceived( [this](const Network::StatusMessageEntry& status_message) { diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp index a81635fa4..c3cacf852 100644 --- a/src/yuzu_cmd/yuzu.cpp +++ b/src/yuzu_cmd/yuzu.cpp @@ -401,7 +401,7 @@ int main(int argc, char** argv) { if (use_multiplayer) { if (auto member = system.GetRoomNetwork().GetRoomMember().lock()) { - member->BindOnChatMessageRecieved(OnMessageReceived); + member->BindOnChatMessageReceived(OnMessageReceived); member->BindOnStatusMessageReceived(OnStatusMessageReceived); member->BindOnStateChanged(OnStateChanged); member->BindOnError(OnNetworkError); From e8671ed04e53ca099d8eea06023b002be52395b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Mon, 15 Jan 2024 23:34:11 +0000 Subject: [PATCH 2/4] Fix one more typo --- src/video_core/renderer_vulkan/vk_scheduler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_scheduler.h b/src/video_core/renderer_vulkan/vk_scheduler.h index f8d8ca80a..51e7ab1e1 100644 --- a/src/video_core/renderer_vulkan/vk_scheduler.h +++ b/src/video_core/renderer_vulkan/vk_scheduler.h @@ -55,7 +55,7 @@ public: /// Requests to begin a renderpass. void RequestRenderpass(const Framebuffer* framebuffer); - /// Requests the current executino context to be able to execute operations only allowed outside + /// Requests the current execution context to be able to execute operations only allowed outside /// of a renderpass. void RequestOutsideRenderPassOperationContext(); From 6531ad56a6d701d84d5ede5f155c5bd91fa70a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Mon, 15 Jan 2024 23:39:45 +0000 Subject: [PATCH 3/4] Fix typos in arrays.xml --- src/android/app/src/main/res/values/arrays.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/android/app/src/main/res/values/arrays.xml b/src/android/app/src/main/res/values/arrays.xml index 0363ff3b6..3d31abbb8 100644 --- a/src/android/app/src/main/res/values/arrays.xml +++ b/src/android/app/src/main/res/values/arrays.xml @@ -29,7 +29,7 @@ @string/language_dutch @string/language_english @string/language_french - @string/langauge_german + @string/language_german @string/language_italian @string/language_japanese @string/language_korean From 16abda59be449484898fdcc55f8f0682ff1cff7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= Date: Tue, 16 Jan 2024 00:09:25 +0000 Subject: [PATCH 4/4] Fix typos in master --- src/hid_core/resources/npad/npad_types.h | 2 +- src/hid_core/resources/npad/npad_vibration.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hid_core/resources/npad/npad_types.h b/src/hid_core/resources/npad/npad_types.h index 074dd40cf..fd86c8e40 100644 --- a/src/hid_core/resources/npad/npad_types.h +++ b/src/hid_core/resources/npad/npad_types.h @@ -318,7 +318,7 @@ struct InternalFlags { BitField<1, 1, u32> is_connected; BitField<2, 1, u32> is_battery_low_ovln_required; BitField<3, 1, u32> is_battery_low_ovln_delay_required; - BitField<4, 1, u32> is_sample_recieved; + BitField<4, 1, u32> is_sample_received; BitField<5, 1, u32> is_virtual_input; BitField<6, 1, u32> is_wired; BitField<8, 1, u32> use_center_clamp; diff --git a/src/hid_core/resources/npad/npad_vibration.cpp b/src/hid_core/resources/npad/npad_vibration.cpp index 3bdd55dec..7056e8eab 100644 --- a/src/hid_core/resources/npad/npad_vibration.cpp +++ b/src/hid_core/resources/npad/npad_vibration.cpp @@ -15,7 +15,7 @@ Result NpadVibration::Activate() { const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); // if (master_volume < 0.0f || master_volume > 1.0f) { - // return ResultVibrationStrenghtOutOfRange; + // return ResultVibrationStrengthOutOfRange; // } volume = master_volume; @@ -30,7 +30,7 @@ Result NpadVibration::SetVibrationMasterVolume(f32 master_volume) { std::scoped_lock lock{mutex}; if (master_volume < 0.0f && master_volume > 1.0f) { - return ResultVibrationStrenghtOutOfRange; + return ResultVibrationStrengthOutOfRange; } volume = master_volume; @@ -50,7 +50,7 @@ Result NpadVibration::GetVibrationMasterVolume(f32& out_volume) const { const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); // if (master_volume < 0.0f || master_volume > 1.0f) { - // return ResultVibrationStrenghtOutOfRange; + // return ResultVibrationStrengthOutOfRange; // } out_volume = master_volume; @@ -69,7 +69,7 @@ Result NpadVibration::EndPermitVibrationSession() { const f32 master_volume = 1.0f; // nn::settings::system::GetVibrationMasterVolume(); // if (master_volume < 0.0f || master_volume > 1.0f) { - // return ResultVibrationStrenghtOutOfRange; + // return ResultVibrationStrengthOutOfRange; // } volume = master_volume;