summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2023-01-26 19:56:31 +0100
committerGitHub <noreply@github.com>2023-01-26 19:56:31 +0100
commit7d0a77a825ff16fc3449cd32d436107507e19ae8 (patch)
tree96c6269e01338fe630d03af62ccbd983632bce0c /src
parentMerge pull request #9670 from merryhime/revert-af5ecb0b15d4449f58434e70eed835cf71fc5527 (diff)
parentinput_common: Implement SetLowPowerMode and TriggersElapsed for the joycon driver (diff)
downloadyuzu-7d0a77a825ff16fc3449cd32d436107507e19ae8.tar
yuzu-7d0a77a825ff16fc3449cd32d436107507e19ae8.tar.gz
yuzu-7d0a77a825ff16fc3449cd32d436107507e19ae8.tar.bz2
yuzu-7d0a77a825ff16fc3449cd32d436107507e19ae8.tar.lz
yuzu-7d0a77a825ff16fc3449cd32d436107507e19ae8.tar.xz
yuzu-7d0a77a825ff16fc3449cd32d436107507e19ae8.tar.zst
yuzu-7d0a77a825ff16fc3449cd32d436107507e19ae8.zip
Diffstat (limited to 'src')
-rw-r--r--src/input_common/helpers/joycon_driver.cpp3
-rw-r--r--src/input_common/helpers/joycon_protocol/generic_functions.cpp11
-rw-r--r--src/input_common/helpers/joycon_protocol/generic_functions.h6
-rw-r--r--src/input_common/helpers/joycon_protocol/joycon_types.h1
4 files changed, 21 insertions, 0 deletions
diff --git a/src/input_common/helpers/joycon_driver.cpp b/src/input_common/helpers/joycon_driver.cpp
index 4159e5717..3775e2d35 100644
--- a/src/input_common/helpers/joycon_driver.cpp
+++ b/src/input_common/helpers/joycon_driver.cpp
@@ -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;
diff --git a/src/input_common/helpers/joycon_protocol/generic_functions.cpp b/src/input_common/helpers/joycon_protocol/generic_functions.cpp
index 52bb8b61a..63cfb1369 100644
--- a/src/input_common/helpers/joycon_protocol/generic_functions.cpp
+++ b/src/input_common/helpers/joycon_protocol/generic_functions.cpp
@@ -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;
diff --git a/src/input_common/helpers/joycon_protocol/generic_functions.h b/src/input_common/helpers/joycon_protocol/generic_functions.h
index 239bb7dbf..424831e81 100644
--- a/src/input_common/helpers/joycon_protocol/generic_functions.h
+++ b/src/input_common/helpers/joycon_protocol/generic_functions.h
@@ -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
diff --git a/src/input_common/helpers/joycon_protocol/joycon_types.h b/src/input_common/helpers/joycon_protocol/joycon_types.h
index e2d47349f..182d2c15b 100644
--- a/src/input_common/helpers/joycon_protocol/joycon_types.h
+++ b/src/input_common/helpers/joycon_protocol/joycon_types.h
@@ -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,