summaryrefslogtreecommitdiffstats
path: root/src/hid_core/resources
diff options
context:
space:
mode:
Diffstat (limited to 'src/hid_core/resources')
-rw-r--r--src/hid_core/resources/hid_firmware_settings.cpp4
-rw-r--r--src/hid_core/resources/hid_firmware_settings.h2
-rw-r--r--src/hid_core/resources/npad/npad_types.h2
-rw-r--r--src/hid_core/resources/npad/npad_vibration.cpp8
-rw-r--r--src/hid_core/resources/six_axis/six_axis.cpp4
-rw-r--r--src/hid_core/resources/six_axis/six_axis.h2
6 files changed, 11 insertions, 11 deletions
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/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;
diff --git a/src/hid_core/resources/six_axis/six_axis.cpp b/src/hid_core/resources/six_axis/six_axis.cpp
index da12d2d5a..abb6fd152 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{};