summaryrefslogtreecommitdiffstats
path: root/src/core/hid
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hid')
-rw-r--r--src/core/hid/emulated_console.cpp1
-rw-r--r--src/core/hid/emulated_controller.cpp98
-rw-r--r--src/core/hid/emulated_controller.h18
-rw-r--r--src/core/hid/hid_types.h8
4 files changed, 95 insertions, 30 deletions
diff --git a/src/core/hid/emulated_console.cpp b/src/core/hid/emulated_console.cpp
index c65d05041..7f7c8fd59 100644
--- a/src/core/hid/emulated_console.cpp
+++ b/src/core/hid/emulated_console.cpp
@@ -53,7 +53,6 @@ void EmulatedConsole::ReloadInput() {
touch_button_params.Set("x", x);
touch_button_params.Set("y", y);
touch_button_params.Set("touch_id", static_cast<int>(index));
- LOG_ERROR(Common, "{} ", touch_button_params.Serialize());
touch_devices[index] =
Input::CreateDeviceFromString<Input::InputDevice>(touch_button_params.Serialize());
if (!touch_devices[index]) {
diff --git a/src/core/hid/emulated_controller.cpp b/src/core/hid/emulated_controller.cpp
index b04ab4cd8..7ef6ef118 100644
--- a/src/core/hid/emulated_controller.cpp
+++ b/src/core/hid/emulated_controller.cpp
@@ -54,6 +54,7 @@ Settings::ControllerType EmulatedController::MapNPadToSettingsType(NpadType type
}
void EmulatedController::ReloadFromSettings() {
+ //LOG_ERROR(Service_HID, "reload config from settings {}", NpadIdTypeToIndex(npad_id_type));
const auto player_index = NpadIdTypeToIndex(npad_id_type);
const auto& player = Settings::values.players.GetValue()[player_index];
@@ -91,6 +92,7 @@ void EmulatedController::ReloadFromSettings() {
}
void EmulatedController::ReloadInput() {
+ //LOG_ERROR(Service_HID, "reload config {}", NpadIdTypeToIndex(npad_id_type));
// If you load any device here add the equivalent to the UnloadInput() function
const auto player_index = NpadIdTypeToIndex(npad_id_type);
const auto left_side = button_params[Settings::NativeButton::ZL];
@@ -187,11 +189,29 @@ void EmulatedController::UnloadInput() {
void EmulatedController::EnableConfiguration() {
is_configuring = true;
- SaveCurrentConfig();
+ temporary_is_connected = is_connected;
+ temporary_npad_type = npad_type;
}
void EmulatedController::DisableConfiguration() {
is_configuring = false;
+
+ // Apply temporary npad type to the real controller
+ if (temporary_npad_type != npad_type) {
+ if (is_connected) {
+ Disconnect();
+ }
+ SetNpadType(temporary_npad_type);
+ }
+
+ // Apply temporary connected status to the real controller
+ if (temporary_is_connected != is_connected) {
+ if (temporary_is_connected) {
+ Connect();
+ return;
+ }
+ Disconnect();
+ }
}
bool EmulatedController::IsConfiguring() const {
@@ -199,10 +219,6 @@ bool EmulatedController::IsConfiguring() const {
}
void EmulatedController::SaveCurrentConfig() {
- if (!is_configuring) {
- return;
- }
-
const auto player_index = NpadIdTypeToIndex(npad_id_type);
auto& player = Settings::values.players.GetValue()[player_index];
player.connected = is_connected;
@@ -657,26 +673,47 @@ void EmulatedController::SetLedPattern() {
}
void EmulatedController::Connect() {
- std::lock_guard lock{mutex};
- if (is_connected) {
- LOG_WARNING(Service_HID, "Tried to turn on a connected controller {}", npad_id_type);
- return;
+ {
+ std::lock_guard lock{mutex};
+ if (is_configuring) {
+ temporary_is_connected = true;
+ TriggerOnChange(ControllerTriggerType::Connected);
+ return;
+ }
+
+ if (is_connected) {
+ return;
+ }
+ is_connected = true;
}
- is_connected = true;
+ LOG_ERROR(Service_HID, "Connected controller {}", NpadIdTypeToIndex(npad_id_type));
TriggerOnChange(ControllerTriggerType::Connected);
}
void EmulatedController::Disconnect() {
- std::lock_guard lock{mutex};
- if (!is_connected) {
- LOG_WARNING(Service_HID, "Tried to turn off a disconnected controller {}", npad_id_type);
- return;
+ {
+ std::lock_guard lock{mutex};
+ if (is_configuring) {
+ temporary_is_connected = false;
+ LOG_ERROR(Service_HID, "Disconnected temporal controller {}",
+ NpadIdTypeToIndex(npad_id_type));
+ TriggerOnChange(ControllerTriggerType::Disconnected);
+ return;
+ }
+
+ if (!is_connected) {
+ return;
+ }
+ is_connected = false;
}
- is_connected = false;
+ LOG_ERROR(Service_HID, "Disconnected controller {}", NpadIdTypeToIndex(npad_id_type));
TriggerOnChange(ControllerTriggerType::Disconnected);
}
-bool EmulatedController::IsConnected() const {
+bool EmulatedController::IsConnected(bool temporary) const {
+ if (temporary) {
+ return temporary_is_connected;
+ }
return is_connected;
}
@@ -688,16 +725,35 @@ NpadIdType EmulatedController::GetNpadIdType() const {
return npad_id_type;
}
-NpadType EmulatedController::GetNpadType() const {
+NpadType EmulatedController::GetNpadType(bool temporary) const {
+ if (temporary) {
+ return temporary_npad_type;
+ }
return npad_type;
}
void EmulatedController::SetNpadType(NpadType npad_type_) {
- std::lock_guard lock{mutex};
- if (npad_type == npad_type_) {
- return;
+ {
+ std::lock_guard lock{mutex};
+
+ if (is_configuring) {
+ if (temporary_npad_type == npad_type_) {
+ return;
+ }
+ temporary_npad_type = npad_type_;
+ TriggerOnChange(ControllerTriggerType::Type);
+ return;
+ }
+
+ if (npad_type == npad_type_) {
+ return;
+ }
+ if (is_connected) {
+ LOG_WARNING(Service_HID, "Controller {} type changed while it's connected",
+ NpadIdTypeToIndex(npad_id_type));
+ }
+ npad_type = npad_type_;
}
- npad_type = npad_type_;
TriggerOnChange(ControllerTriggerType::Type);
}
diff --git a/src/core/hid/emulated_controller.h b/src/core/hid/emulated_controller.h
index 096fe1705..6a6dc1892 100644
--- a/src/core/hid/emulated_controller.h
+++ b/src/core/hid/emulated_controller.h
@@ -139,8 +139,12 @@ public:
/// Sets the NpadType for this controller
void SetNpadType(NpadType npad_type_);
- /// Gets the NpadType for this controller
- NpadType GetNpadType() const;
+ /**
+ * Gets the NpadType for this controller
+ * @param Returns the temporary value if true
+ * @return NpadType set on the controller
+ */
+ NpadType GetNpadType(bool temporary = false) const;
/// Sets the connected status to true
void Connect();
@@ -148,8 +152,12 @@ public:
/// Sets the connected status to false
void Disconnect();
- /// Returns true if the controller has the connected status
- bool IsConnected() const;
+ /**
+ * Is the emulated connected
+ * @param Returns the temporary value if true
+ * @return true if the controller has the connected status
+ */
+ bool IsConnected(bool temporary = false) const;
/// Returns true if vibration is enabled
bool IsVibrationEnabled() const;
@@ -323,7 +331,9 @@ private:
NpadIdType npad_id_type;
NpadType npad_type{NpadType::None};
+ NpadType temporary_npad_type{NpadType::None};
bool is_connected{false};
+ bool temporary_is_connected{false};
bool is_configuring{false};
bool is_vibration_enabled{true};
f32 motion_sensitivity{0.01f};
diff --git a/src/core/hid/hid_types.h b/src/core/hid/hid_types.h
index f12a14cb8..539436283 100644
--- a/src/core/hid/hid_types.h
+++ b/src/core/hid/hid_types.h
@@ -47,9 +47,9 @@ constexpr size_t NpadIdTypeToIndex(NpadIdType npad_id_type) {
return 6;
case NpadIdType::Player8:
return 7;
- case NpadIdType::Other:
- return 8;
case NpadIdType::Handheld:
+ return 8;
+ case NpadIdType::Other:
return 9;
default:
return 0;
@@ -76,9 +76,9 @@ constexpr NpadIdType IndexToNpadIdType(size_t index) {
case 7:
return NpadIdType::Player8;
case 8:
- return NpadIdType::Other;
- case 9:
return NpadIdType::Handheld;
+ case 9:
+ return NpadIdType::Other;
default:
return NpadIdType::Invalid;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 13:41:24 +0200