From 8647c727781accf79fe78c19eeee9acdb24f2927 Mon Sep 17 00:00:00 2001 From: Narr the Reg <juangerman-13@hotmail.com> Date: Fri, 27 Jan 2023 13:12:54 -0600 Subject: input_common: joycon: Remove magic numbers from calibration protocol --- src/input_common/helpers/joycon_protocol/common_protocol.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/input_common/helpers/joycon_protocol/common_protocol.cpp') diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp index 417d0dcc50..2f0ab6b2a7 100644 --- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp +++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp @@ -23,7 +23,7 @@ void JoyconCommonProtocol::SetNonBlocking() { DriverResult JoyconCommonProtocol::GetDeviceType(ControllerType& controller_type) { std::vector<u8> buffer; - const auto result = ReadSPI(CalAddr::DEVICE_TYPE, 1, buffer); + const auto result = ReadSPI(SpiAddress::DEVICE_TYPE, 1, buffer); controller_type = ControllerType::None; if (result == DriverResult::Success) { @@ -148,7 +148,7 @@ DriverResult JoyconCommonProtocol::SendVibrationReport(std::span<const u8> buffe return SendData(local_buffer); } -DriverResult JoyconCommonProtocol::ReadSPI(CalAddr addr, u8 size, std::vector<u8>& output) { +DriverResult JoyconCommonProtocol::ReadSPI(SpiAddress addr, u8 size, std::vector<u8>& output) { constexpr std::size_t MaxTries = 10; std::size_t tries = 0; std::array<u8, 5> buffer = {0x00, 0x00, 0x00, 0x00, size}; -- cgit v1.2.3-70-g09d2