Browse Source
Merge pull request #9683 from german77/high_power_joycon
input_common: Implement SetLowPowerMode and TriggersElapsed
pull/15/merge
bunnei
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
21 additions and
0 deletions
-
src/input_common/helpers/joycon_driver.cpp
-
src/input_common/helpers/joycon_protocol/generic_functions.cpp
-
src/input_common/helpers/joycon_protocol/generic_functions.h
-
src/input_common/helpers/joycon_protocol/joycon_types.h
|
|
|
@ -86,6 +86,7 @@ DriverResult JoyconDriver::InitializeDevice() { |
|
|
|
|
|
|
|
// Get fixed joycon info
|
|
|
|
generic_protocol->GetVersionNumber(version); |
|
|
|
generic_protocol->SetLowPowerMode(false); |
|
|
|
generic_protocol->GetColor(color); |
|
|
|
if (handle_device_type == ControllerType::Pro) { |
|
|
|
// Some 3rd party controllers aren't pro controllers
|
|
|
|
@ -324,6 +325,8 @@ DriverResult JoyconDriver::SetPollingMode() { |
|
|
|
if (result != DriverResult::Success) { |
|
|
|
LOG_ERROR(Input, "Error enabling active mode"); |
|
|
|
} |
|
|
|
// Switch calls this function after enabling active mode
|
|
|
|
generic_protocol->TriggersElapsed(); |
|
|
|
|
|
|
|
disable_input_thread = false; |
|
|
|
return result; |
|
|
|
|
|
|
|
@ -19,6 +19,17 @@ DriverResult GenericProtocol::EnableActiveMode() { |
|
|
|
return SetReportMode(ReportMode::STANDARD_FULL_60HZ); |
|
|
|
} |
|
|
|
|
|
|
|
DriverResult GenericProtocol::SetLowPowerMode(bool enable) { |
|
|
|
ScopedSetBlocking sb(this); |
|
|
|
const std::array<u8, 1> buffer{static_cast<u8>(enable ? 1 : 0)}; |
|
|
|
return SendSubCommand(SubCommand::LOW_POWER_MODE, buffer); |
|
|
|
} |
|
|
|
|
|
|
|
DriverResult GenericProtocol::TriggersElapsed() { |
|
|
|
ScopedSetBlocking sb(this); |
|
|
|
return SendSubCommand(SubCommand::TRIGGERS_ELAPSED, {}); |
|
|
|
} |
|
|
|
|
|
|
|
DriverResult GenericProtocol::GetDeviceInfo(DeviceInfo& device_info) { |
|
|
|
ScopedSetBlocking sb(this); |
|
|
|
std::vector<u8> output; |
|
|
|
|
|
|
|
@ -25,6 +25,12 @@ public: |
|
|
|
/// Enables active mode. This mode will return the current status every 5-15ms |
|
|
|
DriverResult EnableActiveMode(); |
|
|
|
|
|
|
|
/// Enables or disables the low power mode |
|
|
|
DriverResult SetLowPowerMode(bool enable); |
|
|
|
|
|
|
|
/// Unknown function used by the switch |
|
|
|
DriverResult TriggersElapsed(); |
|
|
|
|
|
|
|
/** |
|
|
|
* Sends a request to obtain the joycon firmware and mac from handle |
|
|
|
* @returns controller device info |
|
|
|
|
|
|
|
@ -129,6 +129,7 @@ enum class SubCommand : u8 { |
|
|
|
LOW_POWER_MODE = 0x08, |
|
|
|
SPI_FLASH_READ = 0x10, |
|
|
|
SPI_FLASH_WRITE = 0x11, |
|
|
|
SPI_SECTOR_ERASE = 0x12, |
|
|
|
RESET_MCU = 0x20, |
|
|
|
SET_MCU_CONFIG = 0x21, |
|
|
|
SET_MCU_STATE = 0x22, |
|
|
|
|