From 1da03e9429c0e4b30f796eb667f789e554ac7bd3 Mon Sep 17 00:00:00 2001
From: jonny_ji7 <jonny@wwad.de>
Date: Fri, 24 Jun 2022 09:06:26 +0200
Subject: [PATCH] Add different tolerances for X and Y coordinate

As already did for http joystick:
- Add different config options tolerance zero for X and Y axis for
normal/actual joystick.

This makes it possible to set Y tolerance to a lower value resulting in
a more responsive turning action, with still having a large range around
X axis for turning mode
---
 main/config.cpp   | 9 +++++----
 main/joystick.cpp | 4 ++--
 main/joystick.hpp | 9 +++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/main/config.cpp b/main/config.cpp
index 30f6e12..c6ef330 100644
--- a/main/config.cpp
+++ b/main/config.cpp
@@ -71,10 +71,11 @@ httpJoystick_config_t configHttpJoystickMain{
 joystick_config_t configJoystick = {
     .adc_x = ADC1_CHANNEL_3, //GPIO39
     .adc_y = ADC1_CHANNEL_0, //GPIO36
-    //range around center-threshold of each axis the coordinates stays at 0 (percentage of available range 0-100)
-    .tolerance_zero = 7,
-    //threshold the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (percentage of available range 0-100)
-    .tolerance_end = 5, 
+    //percentage of joystick range the coordinate of the axis snaps to 0 (0-100)
+    .tolerance_zeroX_per = 7,
+    .tolerance_zeroY_per = 3,
+    //percentage of joystick range the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (0-100)
+    .tolerance_end_per = 5, 
     //threshold the radius jumps to 1 before the stick is at max radius (range 0-1)
     .tolerance_radius = 0.05,
 
diff --git a/main/joystick.cpp b/main/joystick.cpp
index 7322a8e..9796a55 100644
--- a/main/joystick.cpp
+++ b/main/joystick.cpp
@@ -76,11 +76,11 @@ joystickData_t evaluatedJoystick::getData() {
     //get coordinates
     //TODO individual tolerances for each axis? Otherwise some parameters can be removed
     ESP_LOGD(TAG, "getting X coodrinate...");
-    float x = scaleCoordinate(readAdc(config.adc_x, config.x_inverted), config.x_min, config.x_max, x_center,  config.tolerance_zero, config.tolerance_end);
+    float x = scaleCoordinate(readAdc(config.adc_x, config.x_inverted), config.x_min, config.x_max, x_center,  config.tolerance_zeroX_per, config.tolerance_end_per);
     data.x = x;
 
     ESP_LOGD(TAG, "getting Y coodrinate...");
-    float y = scaleCoordinate(readAdc(config.adc_y, config.y_inverted), config.y_min, config.y_max, y_center,  config.tolerance_zero, config.tolerance_end);
+    float y = scaleCoordinate(readAdc(config.adc_y, config.y_inverted), config.y_min, config.y_max, y_center,  config.tolerance_zeroY_per, config.tolerance_end_per);
     data.y = y;
 
     //calculate radius
diff --git a/main/joystick.hpp b/main/joystick.hpp
index 050c51d..663a6da 100644
--- a/main/joystick.hpp
+++ b/main/joystick.hpp
@@ -31,10 +31,11 @@ typedef struct joystick_config_t {
     adc1_channel_t adc_x;
     adc1_channel_t adc_y;
 
-    //range around center-threshold of each axis the coordinates stays at 0 (adc value 0-4095)
-    int tolerance_zero;
-    //threshold the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (adc value 0-4095)
-    int tolerance_end;
+    //percentage of joystick range the coordinate of the axis snaps to 0 (0-100)
+    int tolerance_zeroX_per;
+    int tolerance_zeroY_per;
+    //percentage of joystick range the coordinate snaps to -1 or 1 before configured "_max" or "_min" threshold (mechanical end) is reached (0-100)
+    int tolerance_end_per;
     //threshold the radius jumps to 1 before the stick is at max radius (range 0-1)
     float tolerance_radius;