Add a mappable shake input

 - mappable "shake" input

Co-authored-by: Shuken <shukenmg@iuvenisstudios.ga>

Author: shukenmg

BetterJoyForCemu/App.config

@@ -25,6 +25,16 @@
         <!--On is "true"; off is "false". Default: true -->
         <add key="EnableRumble" value="true" />
 
+        <!--Enables a input when shaking a controller, only works with DS4 for now, replaces the touchpad input (Button 13 on DirectInput)-->
+        <!--On is "true"; off is "false". Default: false -->
+        <add key="EnableShakeInput" value="false" />
+        <!--How sensitve the shake detection should be. Default: 10-->
+        <add key="ShakeInputSensitivity" value="10" />
+        <!--How often should the shake input run in milliseconds. -->
+        <!--Don't set this lower than 15 -->
+        <!-- Default: 200 -->
+        <add key="ShakeInputDelay" value="200" />
+        
         <!--Swap A-B buttons; if on, this mimicks the (half of) Xbox layout by the button name, rather than by the physical layout.-->
         <!--Also swaps buttons when using "Also use for buttons/axes"-->
         <!--On is "true"; off is "false". Default: false -->

BetterJoyForCemu/Config.cs

@@ -7,7 +7,7 @@ public static class Config { // stores dynamic configuration, including
 		const string PATH = "settings";
 		static Dictionary<string, string> variables = new Dictionary<string, string>();
 
-		const int settingsNum = 10; // currently - ProgressiveScan, StartInTray + special buttons
+		const int settingsNum = 11; // currently - ProgressiveScan, StartInTray + special buttons
 
 		public static string GetDefaultValue(string s) {
 			switch (s) {
@@ -21,15 +21,36 @@ public static string GetDefaultValue(string s) {
 			return "0";
 		}
 
+		// Helper function to count how many lines are in a file
+		// https://www.dotnetperls.com/line-count
+		static long CountLinesInFile(string f) {
+			// Zero based count
+			long count = -1;
+			using (StreamReader r = new StreamReader(f)) {
+				string line;
+				while ((line = r.ReadLine()) != null) {
+					count++;
+				}
+			}
+			return count;
+		}
+
 		public static void Init(List<KeyValuePair<string, float[]>> caliData) {
-			foreach (string s in new string[] { "ProgressiveScan", "StartInTray", "capture", "home", "sl_l", "sl_r", "sr_l", "sr_r", "reset_mouse", "active_gyro" })
+			foreach (string s in new string[] { "ProgressiveScan", "StartInTray", "capture", "home", "sl_l", "sl_r", "sr_l", "sr_r", "shake", "reset_mouse", "active_gyro" })
 				variables[s] = GetDefaultValue(s);
 
 			if (File.Exists(PATH)) {
-				int lineNO = 0;
+
+				// Reset settings file if old settings
+				if (CountLinesInFile(PATH) < settingsNum) {
+					File.Delete(PATH);
+					Init(caliData);
+					return;
+				}
+
 				using (StreamReader file = new StreamReader(PATH)) {
 					string line = String.Empty;
-
+					int lineNO = 0;
 					while ((line = file.ReadLine()) != null) {
 						string[] vs = line.Split();
 						try {
@@ -52,14 +73,6 @@ public static void Init(List<KeyValuePair<string, float[]>> caliData) {
 						} catch { }
 						lineNO++;
 					}
-
-
-				}
-
-				// if old settings
-				if (lineNO < settingsNum) {
-					File.Delete(PATH);
-					Init(caliData);
 				}
 			} else {
 				using (StreamWriter file = new StreamWriter(PATH)) {

BetterJoyForCemu/Joycon.cs

@@ -31,6 +31,7 @@ public enum DebugType : int {
             THREADING,
             IMU,
             RUMBLE,
+            SHAKE,
         };
         public DebugType debug_type = DebugType.NONE;
         public bool isLeft;
@@ -574,6 +575,38 @@ private int ReceiveRaw() {
             return ret;
         }
 
+        private readonly Stopwatch shakeTimer = Stopwatch.StartNew(); //Setup a timer for measuring shake in milliseconds
+        private long shakedTime = 0;
+        private bool hasShaked;
+        void DetectShake() {
+            if (form.shakeInputEnabled) {
+                long currentShakeTime = shakeTimer.ElapsedMilliseconds;
+
+                // Shake detection logic
+                bool isShaking = GetAccel().LengthSquared() >= form.shakeSesitivity;
+                if (isShaking && currentShakeTime >= shakedTime + form.shakeDelay || isShaking && shakedTime == 0) {
+                    shakedTime = currentShakeTime;
+                    hasShaked = true;
+
+                    // Mapped shake key down
+                    Simulate(Config.Value("shake"), false, false);
+                    DebugPrint("Shaked at time: " + shakedTime.ToString(), DebugType.SHAKE);
+                }
+
+                // If controller was shaked then release mapped key after a small delay to simulate a button press, then reset hasShaked
+                if (hasShaked && currentShakeTime >= shakedTime + 10) {
+                    // Mapped shake key up
+                    Simulate(Config.Value("shake"), false, true);
+                    DebugPrint("Shake completed", DebugType.SHAKE);
+                    hasShaked = false;
+                }
+
+            } else {
+                shakeTimer.Stop();
+                return;
+            }
+        }
+
         bool dragToggle = Boolean.Parse(ConfigurationManager.AppSettings["DragToggle"]);
         Dictionary<int, bool> mouse_toggle_btn = new Dictionary<int, bool>();
         private void Simulate(string s, bool click = true, bool up = false) {
@@ -655,6 +688,8 @@ private void DoThingsWithButtons() {
                 }
             }
 
+            DetectShake();
+
             if (buttons_down[(int)Button.CAPTURE])
                 Simulate(Config.Value("capture"));
             if (buttons_down[(int)Button.HOME])

BetterJoyForCemu/MainForm.cs

@@ -22,6 +22,9 @@ public partial class MainForm : Form {
         private Timer countDown;
         private int count;
         public List<int> xG, yG, zG, xA, yA, zA;
+        public bool shakeInputEnabled = Boolean.Parse(ConfigurationManager.AppSettings["EnableShakeInput"]);
+        public float shakeSesitivity = float.Parse(ConfigurationManager.AppSettings["ShakeInputSensitivity"]);
+        public float shakeDelay = float.Parse(ConfigurationManager.AppSettings["ShakeInputDelay"]);
 
         public MainForm() {
             xG = new List<int>(); yG = new List<int>(); zG = new List<int>();