From 6e9e0e21440eb70babe6d13f73ef19aed1c62af1 Mon Sep 17 00:00:00 2001
From: "Hansi, dl9rdz" <dl9rdz@darc.de>
Date: Sun, 27 Oct 2019 00:10:13 +0200
Subject: [PATCH] fix support for 'real' button2 (not touch)

---
 RX_FSK/RX_FSK.ino | 38 ++++++++++++++++++++++++++++++++++++++
 RX_FSK/version.h  |  2 +-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino
index 6ae16ce..cf7b283 100644
--- a/RX_FSK/RX_FSK.ino
+++ b/RX_FSK/RX_FSK.ino
@@ -1064,6 +1064,38 @@ void IRAM_ATTR buttonISR() {
   }
 }
 
+void IRAM_ATTR button2ISR() {
+  if (digitalRead(button2.pin) == 0) { // Button down
+    unsigned long now = my_millis();
+    if (now - button2.keydownTime > 50 && now - button2.keydownTime < 500) {
+      // Double press
+      button2.doublepress = 1;
+      //bdd1 = now; bdd2 = button1.keydownTime;
+    } else {
+      button2.doublepress = 0;
+    }
+    button2.numberKeyPresses += 1;
+    button2.keydownTime = now;
+  } else { //Button up
+    unsigned long now = my_millis();
+    if (button2.doublepress == -1) return;   // key was never pressed before, ignore button up
+    unsigned int elapsed = now - button2.keydownTime;
+    if (elapsed > 1500) {
+      if (elapsed < 4000) {
+        button2.pressed = KP_MID;
+      }
+      else {
+        button2.pressed = KP_LONG;
+      }
+    } else {
+      if (button2.doublepress) button2.pressed = KP_DOUBLE;
+      else button2.pressed = KP_SHORT;
+    }
+    button2.numberKeyPresses += 1;
+    button2.keydownTime = now;
+  }
+}
+
 int getKeyPress() {
   KeyPress p = button1.pressed;
   button1.pressed = KP_NONE;
@@ -1237,12 +1269,18 @@ void setup()
     pinMode(button1.pin, INPUT);  // configure as input if not disabled
   if (button2.pin != 0xff)
     pinMode(button2.pin, INPUT);  // configure as input if not disabled
+    //pinMode(button2.pin, INPUT);  // configure as input if not disabled
 
   // Handle button press
   if ( (button1.pin & 0x80) == 0) {
     attachInterrupt( button1.pin, buttonISR, CHANGE);
     Serial.printf("button1.pin is %d, attaching interrupt\n", button1.pin);
   }
+  // Handle button press
+  if ( (button2.pin & 0x80) == 0) {
+    attachInterrupt( button2.pin, button2ISR, CHANGE);
+    Serial.printf("button2.pin is %d, attaching interrupt\n", button2.pin);
+  }  
   initTouch();
 
   disp.init();
diff --git a/RX_FSK/version.h b/RX_FSK/version.h
index af838d0..e5902f4 100644
--- a/RX_FSK/version.h
+++ b/RX_FSK/version.h
@@ -1,2 +1,2 @@
 const char *version_name = "rdzTTGOsonde";
-const char *version_id = "devel20191021";
+const char *version_id = "devel20191026";