Use log scale for rumble.

Author: Mysticial

SerialPrograms/Source/Controllers/RumbleListener.h

@@ -23,7 +23,7 @@ class RumbleWatcher : public ExternalInferenceCallback, public RumbleListener{
     //  For now, the magnitudes are all over the place and inconsistent.
     //  So the only thing this can really do is detect is *any* rumble is
     //  happening. The magnitudes are trash.
-    RumbleWatcher(ControllerType& controller, double magnitude_threshold = 10)
+    RumbleWatcher(ControllerType& controller, double magnitude_threshold = 2)
         : ExternalInferenceCallback("RumbleWatcher")
         , m_controller(controller)
         , m_magnitude_threshold(magnitude_threshold)

SerialPrograms/Source/NintendoSwitch/Controllers/Joycon/NintendoSwitch_Joycon.h

@@ -11,7 +11,6 @@
 #include "Controllers/Joystick.h"
 #include "Controllers/ControllerTypes.h"
 #include "Controllers/Controller.h"
-#include "Controllers/RumbleListener.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
 
 namespace PokemonAutomation{

SerialPrograms/Source/NintendoSwitch/Controllers/PABotBase2/NintendoSwitch_PABotBase2_OemController.cpp

@@ -190,15 +190,19 @@ PABotBase2_OemController::PABotBase2_OemController(
             }
             if (!str_right.empty()){
                 if (!str.empty()){
-                    str += ", ";
+                    str += " - ";
                 }
                 str += "Right = ";
                 str += str_right;
             }
 
-            double magnitude =
-                left.lo_amp * left.lo_freq + left.hi_amp * left.hi_freq +
-                right.lo_amp * right.lo_freq + right.hi_amp * right.hi_freq;
+            double energy =
+                left.lo_amp * left.lo_freq * left.lo_freq +
+                left.hi_amp * left.hi_freq * left.hi_freq +
+                right.lo_amp * right.lo_freq * right.lo_freq +
+                right.hi_amp * right.hi_freq * right.hi_freq;
+
+            double magnitude = std::log10(energy + 1);
 
             if (m_on_rumble){
                 m_on_rumble(magnitude);

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -173,6 +173,7 @@
 #include "CommonTools/OCR/OCR_RawPaddleOCR.h"
 #include "CommonTools/Images/ImageTools.h"
 #include "PokemonFRLG/Inference/PokemonFRLG_BattleSelectionArrowDetector.h"
+#include "Controllers/RumbleListener.h"