diff options
Diffstat (limited to 'src/input_common/helpers/joycon_protocol/calibration.cpp')
| -rw-r--r-- | src/input_common/helpers/joycon_protocol/calibration.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/input_common/helpers/joycon_protocol/calibration.cpp b/src/input_common/helpers/joycon_protocol/calibration.cpp index d8f040f75..69e3379cf 100644 --- a/src/input_common/helpers/joycon_protocol/calibration.cpp +++ b/src/input_common/helpers/joycon_protocol/calibration.cpp | |||
| @@ -129,7 +129,7 @@ DriverResult CalibrationProtocol::GetImuCalibration(MotionCalibration& calibrati | |||
| 129 | 129 | ||
| 130 | DriverResult CalibrationProtocol::GetRingCalibration(RingCalibration& calibration, | 130 | DriverResult CalibrationProtocol::GetRingCalibration(RingCalibration& calibration, |
| 131 | s16 current_value) { | 131 | s16 current_value) { |
| 132 | constexpr s16 DefaultRingRange{800}; | 132 | constexpr static s16 DefaultRingRange{800}; |
| 133 | 133 | ||
| 134 | // TODO: Get default calibration form ring itself | 134 | // TODO: Get default calibration form ring itself |
| 135 | if (ring_data_max == 0 && ring_data_min == 0) { | 135 | if (ring_data_max == 0 && ring_data_min == 0) { |
| @@ -168,8 +168,8 @@ u16 CalibrationProtocol::GetYAxisCalibrationValue(std::span<u8> block) const { | |||
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | void CalibrationProtocol::ValidateCalibration(JoyStickCalibration& calibration) { | 170 | void CalibrationProtocol::ValidateCalibration(JoyStickCalibration& calibration) { |
| 171 | constexpr u16 DefaultStickCenter{0x800}; | 171 | constexpr static u16 DefaultStickCenter{0x800}; |
| 172 | constexpr u16 DefaultStickRange{0x6cc}; | 172 | constexpr static u16 DefaultStickRange{0x6cc}; |
| 173 | 173 | ||
| 174 | calibration.x.center = ValidateValue(calibration.x.center, DefaultStickCenter); | 174 | calibration.x.center = ValidateValue(calibration.x.center, DefaultStickCenter); |
| 175 | calibration.x.max = ValidateValue(calibration.x.max, DefaultStickRange); | 175 | calibration.x.max = ValidateValue(calibration.x.max, DefaultStickRange); |
| @@ -181,9 +181,9 @@ void CalibrationProtocol::ValidateCalibration(JoyStickCalibration& calibration) | |||
| 181 | } | 181 | } |
| 182 | 182 | ||
| 183 | void CalibrationProtocol::ValidateCalibration(MotionCalibration& calibration) { | 183 | void CalibrationProtocol::ValidateCalibration(MotionCalibration& calibration) { |
| 184 | constexpr s16 DefaultAccelerometerScale{0x4000}; | 184 | constexpr static s16 DefaultAccelerometerScale{0x4000}; |
| 185 | constexpr s16 DefaultGyroScale{0x3be7}; | 185 | constexpr static s16 DefaultGyroScale{0x3be7}; |
| 186 | constexpr s16 DefaultOffset{0}; | 186 | constexpr static s16 DefaultOffset{0}; |
| 187 | 187 | ||
| 188 | for (auto& sensor : calibration.accelerometer) { | 188 | for (auto& sensor : calibration.accelerometer) { |
| 189 | sensor.scale = ValidateValue(sensor.scale, DefaultAccelerometerScale); | 189 | sensor.scale = ValidateValue(sensor.scale, DefaultAccelerometerScale); |