Merge pull request #13034 from t895/map-all-the-inputs

android: Input mapping

2 files changed, 12 insertions, 1 deletions

diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index 819460eb5..3fa06d188 100644
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -176,16 +176,19 @@ void EmulatedController::LoadDevices() {
         camera_params[1] = Common::ParamPackage{"engine:camera,camera:1"};
         ring_params[1] = Common::ParamPackage{"engine:joycon,axis_x:100,axis_y:101"};
         nfc_params[0] = Common::ParamPackage{"engine:virtual_amiibo,nfc:1"};
+        android_params = Common::ParamPackage{"engine:android,port:100"};
     }
 
     output_params[LeftIndex] = left_joycon;
     output_params[RightIndex] = right_joycon;
     output_params[2] = camera_params[1];
     output_params[3] = nfc_params[0];
+    output_params[4] = android_params;
     output_params[LeftIndex].Set("output", true);
     output_params[RightIndex].Set("output", true);
     output_params[2].Set("output", true);
     output_params[3].Set("output", true);
+    output_params[4].Set("output", true);
 
     LoadTASParams();
     LoadVirtualGamepadParams();
@@ -578,6 +581,9 @@ void EmulatedController::DisableConfiguration() {
 
     // Get Joycon colors before turning on the controller
     for (const auto& color_device : color_devices) {
+        if (color_device == nullptr) {
+            continue;
+        }
         color_device->ForceUpdate();
     }
 
@@ -1277,6 +1283,10 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
         .high_frequency = vibration.high_frequency,
         .type = type,
     };
+
+    // Send vibrations to Android's input overlay
+    output_devices[4]->SetVibration(status);
+
     return output_devices[index]->SetVibration(status) == Common::Input::DriverResult::Success;
 }
 
diff --git a/src/hid_core/frontend/emulated_controller.h b/src/hid_core/frontend/emulated_controller.h
index 701b38300..ab3c6fcd3 100644
--- a/src/hid_core/frontend/emulated_controller.h
+++ b/src/hid_core/frontend/emulated_controller.h
@@ -21,7 +21,7 @@
 
 namespace Core::HID {
 const std::size_t max_emulated_controllers = 2;
-const std::size_t output_devices_size = 4;
+const std::size_t output_devices_size = 5;
 struct ControllerMotionInfo {
     Common::Input::MotionStatus raw_status{};
     MotionInput emulated{};
@@ -597,6 +597,7 @@ private:
     CameraParams camera_params;
     RingAnalogParams ring_params;
     NfcParams nfc_params;
+    Common::ParamPackage android_params;
     OutputParams output_params;
 
     ButtonDevices button_devices;