From b143df91be5c7f18a61666baa4a5b673d2cfd2cd Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Mon, 28 Oct 2019 16:40:14 +0100
Subject: Android: Native motion controls

---
 .../InputCommon/ControllerInterface/Android/Android.cpp    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'Source/Core/InputCommon/ControllerInterface/Android/Android.cpp')

diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 910b7553c9..78fc029374 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -185,6 +185,20 @@ Touchscreen::Touchscreen(int padID) : _padID(padID)
   AddInput(new Axis(_padID, ButtonManager::TURNTABLE_CROSSFADE_RIGHT));
   AddInput(new Axis(_padID, ButtonManager::TURNTABLE_EFFECT_DIAL));
 
+  // Wiimote IMU
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_LEFT));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_RIGHT));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_FORWARD));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_BACKWARD));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_UP));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_DOWN));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_PITCH_UP));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_PITCH_DOWN));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_ROLL_LEFT));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_ROLL_RIGHT));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_YAW_LEFT));
+  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_YAW_RIGHT));
+
   // Rumble
   AddOutput(new Motor(_padID, ButtonManager::RUMBLE));
 }
-- 
cgit v1.2.3


From c8b8a60033bb35917c10eeb5c4043ee428ae61a6 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Wed, 20 Nov 2019 19:40:47 +0100
Subject: Android: Let WiimoteEmu know whether we have accelerometer/gyroscope

---
 .../ControllerInterface/Android/Android.cpp        | 47 ++++++++++++++++------
 1 file changed, 35 insertions(+), 12 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerInterface/Android/Android.cpp')

diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
index 78fc029374..21537cba15 100644
--- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
+++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp
@@ -10,6 +10,21 @@
 
 namespace ciface::Android
 {
+static bool s_accelerometer_enabled = false;
+static bool s_gyroscope_enabled = false;
+
+void SetMotionSensorsEnabled(bool accelerometer_enabled, bool gyroscope_enabled)
+{
+  const bool any_changes =
+      s_accelerometer_enabled != accelerometer_enabled || s_gyroscope_enabled != gyroscope_enabled;
+
+  s_accelerometer_enabled = accelerometer_enabled;
+  s_gyroscope_enabled = gyroscope_enabled;
+
+  if (any_changes)
+    g_controller_interface.RefreshDevices();
+}
+
 void PopulateDevices()
 {
   for (int i = 0; i < 8; ++i)
@@ -186,18 +201,26 @@ Touchscreen::Touchscreen(int padID) : _padID(padID)
   AddInput(new Axis(_padID, ButtonManager::TURNTABLE_EFFECT_DIAL));
 
   // Wiimote IMU
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_LEFT));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_RIGHT));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_FORWARD));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_BACKWARD));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_UP));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_DOWN));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_PITCH_UP));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_PITCH_DOWN));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_ROLL_LEFT));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_ROLL_RIGHT));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_YAW_LEFT));
-  AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_YAW_RIGHT));
+  // Only add inputs if we actually can receive data from the relevant sensor.
+  // Whether inputs exist affects what WiimoteEmu gets when calling ControlReference::BoundCount.
+  if (s_accelerometer_enabled)
+  {
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_LEFT));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_RIGHT));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_FORWARD));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_BACKWARD));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_UP));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_ACCEL_DOWN));
+  }
+  if (s_gyroscope_enabled)
+  {
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_PITCH_UP));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_PITCH_DOWN));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_ROLL_LEFT));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_ROLL_RIGHT));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_YAW_LEFT));
+    AddInput(new Axis(_padID, ButtonManager::WIIMOTE_GYRO_YAW_RIGHT));
+  }
 
   // Rumble
   AddOutput(new Motor(_padID, ButtonManager::RUMBLE));
-- 
cgit v1.2.3