From 317e2f86566275c744d534edaa4f6369c992f64b Mon Sep 17 00:00:00 2001
From: Noah Axon <n0xa@h-i-r.net>
Date: Mon, 13 Nov 2023 12:49:12 -0600
Subject: [PATCH] Unify TRIGGER logic on TVBG flow

---
 m5stick-nemo.ino | 11 +++++------
 tvbg.h           |  4 ----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/m5stick-nemo.ino b/m5stick-nemo.ino
index 27de0de..6dc800e 100644
--- a/m5stick-nemo.ino
+++ b/m5stick-nemo.ino
@@ -456,10 +456,9 @@ void tvbgone_setup() {
 
 void tvbgone_loop()
 {
-  if (digitalRead(TRIGGER) == BUTTON_PRESSED)
-  {
+  if (digitalRead(M5_BUTTON_HOME) == LOW) {
     delay_ten_us(40000);
-    while (digitalRead(TRIGGER) == BUTTON_PRESSED) {
+    while (digitalRead(M5_BUTTON_HOME) == LOW) {
       delay_ten_us(500);
       yield();
     }
@@ -577,9 +576,9 @@ void sendAllCodes()
       break;     
     }
     #endif
-    // TODO Replace TRIGGER with better button defs
-    if (digitalRead(TRIGGER) == BUTTON_PRESSED){
-      while (digitalRead(TRIGGER) == BUTTON_PRESSED) {
+
+    if (digitalRead(M5_BUTTON_HOME) == LOW){
+      while (digitalRead(M5_BUTTON_HOME) == LOW) {
         yield();
       }
       endingEarly = true;
diff --git a/tvbg.h b/tvbg.h
index 72315d3..5d06e74 100644
--- a/tvbg.h
+++ b/tvbg.h
@@ -14,8 +14,6 @@ By Anton Grimpelhuber (anton.grimpelhuber@gmail.com)
 // What pins do what
 #define LED 10 //LED indicator pin (built-in LED)
 #define IRLED 9        //the IR sender LED / D5 on wemos D1 mini
-#define TRIGGER 37       //the button pin / D6 on wemos D1 mini
-#define REGIONSWITCH 39  //HIGH (1) = NA, LOW (0) = EU; Pin 5 / D1 (REGIONSWITCH) is HIGH (via in input pullup resistor) for North America, or you (the user) must wire it to ground to set the codes for Europe.
 
 // Lets us calculate the size of the NA/EU databases
 #define NUM_ELEM(x) (sizeof (x) / sizeof (*(x)));
@@ -77,8 +75,6 @@ uint8_t read_bits(uint8_t count)
   }
   return tmp;
 }
-#define BUTTON_PRESSED LOW
-#define BUTTON_RELEASED HIGH
 uint16_t ontime, offtime;
 uint8_t i, num_codes;
 uint8_t region;