From 8233593559753d9da2eff45c9cabb3fe3617ad28 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Thu, 6 Aug 2020 14:39:01 +0200
Subject: [PATCH] Fix ESP32 default odroid joystick setting

---
 tasmota/xsns_02_analog_esp32.ino | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/tasmota/xsns_02_analog_esp32.ino b/tasmota/xsns_02_analog_esp32.ino
index a47db706a..5918a1b91 100644
--- a/tasmota/xsns_02_analog_esp32.ino
+++ b/tasmota/xsns_02_analog_esp32.ino
@@ -26,7 +26,7 @@
 #define XSNS_02                       2
 
 #define ANALOG_RESOLUTION             12               // 12 = 4095, 11 = 2047, 10 = 1023
-#define ANALOG_RANGE                  4095
+#define ANALOG_RANGE                  4095             // 4095 = 12, 2047 = 11, 1023 = 10
 
 #define TO_CELSIUS(x) ((x) - 273.15)
 #define TO_KELVIN(x) ((x) + 273.15)
@@ -65,6 +65,17 @@
 
 #define CT_FLAG_ENERGY_RESET          (1 << 0)         // Reset energy total
 
+// Odroid joysticks
+//        ---- Up
+// 3V3 ---|  |------------
+//                        |
+//        ---- Dn         |--- R10k --- Gnd
+// 3V3 ---|  |--- R10k ---|
+//                        |
+//                       ADC
+// Press "Up" will raise ADC to ANALOG_RANGE, Press "Dn" will raise ADC to ANALOG_RANGE/2
+#define ANALOG_JOYSTICK              (ANALOG_RANGE / 3) +100  // Add resistor tolerance
+
 struct {
   uint8_t present = 0;
   uint8_t type = 0;
@@ -127,12 +138,12 @@ void AdcInitParams(uint8_t idx) {
       Adc[idx].param4 = 100;
     }
     else if (ADC_CT_POWER == Adc[idx].type) {
-      Adc[idx].param1 = ANALOG_CT_FLAGS;              //(uint32_t) 0
-      Adc[idx].param2 = ANALOG_CT_MULTIPLIER;         //(uint32_t) 100000
-      Adc[idx].param3 = ANALOG_CT_VOLTAGE;            //(int)      10
+      Adc[idx].param1 = ANALOG_CT_FLAGS;         // (uint32_t) 0
+      Adc[idx].param2 = ANALOG_CT_MULTIPLIER;    // (uint32_t) 100000
+      Adc[idx].param3 = ANALOG_CT_VOLTAGE;       // (int)      10
     }
     else if (ADC_JOY == Adc[idx].type) {
-      Adc[idx].param1 = (ANALOG_RANGE / 2) -128;
+      Adc[idx].param1 = ANALOG_JOYSTICK;
     }
   }
 }