Roll-back joystick calibration forcing values to maximum due to changes in angle.

Author: Mysticial

SerialPrograms/Source/Controllers/JoystickTools.h

@@ -8,6 +8,7 @@
 #define PokemonAutomation_Controllers_JoystickTools_H
 
 #include <stdint.h>
+#include <algorithm>
 
 namespace PokemonAutomation{
 namespace JoystickTools{
@@ -23,45 +24,33 @@ inline double linear_u8_to_float(uint8_t x){
 }
 inline uint8_t linear_float_to_u8(double f){
     if (f <= 0){
-        if (f <= -1){
-            return 0;
-        }
+        f = std::max<double>(f, -1);
         f = f * 128 + 128;
         return (uint8_t)(f + 0.5);
     }else{
-        if (f >= 1){
-            return 255;
-        }
+        f = std::min<double>(f, +1);
         f = f * 127 + 128;
         return (uint8_t)(f + 0.5);
     }
 }
 inline int16_t linear_float_to_s16(double f){
     if (f <= 0){
-        if (f <= -1){
-            return -32768;
-        }
+        f = std::max<double>(f, -1);
         f = f * 32768;
         return (int16_t)(f + 0.5);
     }else{
-        if (f >= 1){
-            return 32767;
-        }
+        f = std::min<double>(f, +1);
         f = f * 32767;
         return (int16_t)(f + 0.5);
     }
 }
 inline uint16_t linear_float_to_u16(double f){
     if (f <= 0){
-        if (f <= -1){
-            return 0;
-        }
+        f = std::max<double>(f, -1);
         f = f * 32768 + 32768;
         return (uint16_t)(f + 0.5);
     }else{
-        if (f >= 1){
-            return 65535;
-        }
+        f = std::min<double>(f, +1);
         f = f * 32767 + 32768;
         return (uint16_t)(f + 0.5);
     }
@@ -70,16 +59,14 @@ inline uint16_t linear_float_to_u12(double lo, double hi, double f){
     if (f == 0){
         return 2048;
     }else if (f <= 0){
-        if (f <= -1){
-            return 0;
-        }
+        f = std::max<double>(f, -1);
+//        if (f < -1){ return 0; }
         f = f * (hi - lo) - lo;
         f = f * 2048 + 2048;
         return (uint16_t)(f + 0.5);
     }else{
-        if (f >= 1){
-            return 4095;
-        }
+        f = std::min<double>(f, +1);
+//        if (f > 1){ return 4095; }
         f = f * (hi - lo) + lo;
         f = f * 2047 + 2048;
         return (uint16_t)(f + 0.5);