Change pin assignment for easier swap from Wemos D1 mini to LilyGO TTGO T7 Mini32 and vice versa

Author: 0xCAFEDECAF

VanLiveConnect/Config.h

@@ -120,14 +120,17 @@
 //   to simulate a power-off event.
 //
 #ifdef ARDUINO_ARCH_ESP32
+ // Only GPIOs which are have RTC functionality can be used: 0,2,4,12-15,25-27,32-39.
  #ifdef CONFIG_IDF_TARGET_ESP32S2
   #define LIGHT_SLEEP_WAKE_PIN GPIO_NUM_35
  #else
-  // Only GPIOs which are have RTC functionality can be used: 0,2,4,12-15,25-27,32-39.
-  #define LIGHT_SLEEP_WAKE_PIN GPIO_NUM_13
+  #define LIGHT_SLEEP_WAKE_PIN GPIO_NUM_26  // GPIO pins also tested OK: 13, 36. Tested NOT OK: 23.
+  #define LIGHT_SLEEP_WAKE_PIN_ALT GPIO_NUM_22  // Matches pin D0 on Wemos D1 mini board
  #endif
+
 #else
   #define LIGHT_SLEEP_WAKE_PIN D1
+  #define LIGHT_SLEEP_WAKE_PIN_ALT D0  // Matches pin GPIO_NUM_22 on LilyGO TTGO T7 Mini32 board
 #endif // ARDUINO_ARCH_ESP32
 
 // -----
@@ -299,16 +302,16 @@
     #define IR_GND GPIO_NUM_5
    #else
     #define IR_RECV_PIN GPIO_NUM_23 // IR receiver data pin
-    #define IR_VCC GPIO_NUM_18
-    #define IR_GND GPIO_NUM_26
+    #define IR_VCC GPIO_NUM_19
+    #define IR_GND GPIO_NUM_18
    #endif
   #else
     #define IR_RECV_PIN D7 // IR receiver data pin
 
-    // Using D5 as VCC and D0 as ground pin for the IR receiver. Should be possible with e.g. the
+    // Using D6 as VCC and D5 as ground pin for the IR receiver. Should be possible with e.g. the
     // TSOP31238 IR receiver as it typically uses only 0.35 mA.
-    #define IR_VCC D5
-    #define IR_GND D0
+    #define IR_VCC D6
+    #define IR_GND D5
 
   #endif // ARDUINO_ARCH_ESP32
 
@@ -324,13 +327,13 @@
     #define IR_GND GPIO_NUM_5
    #else
     #define TEST_IR_RECV_PIN GPIO_NUM_23
-    #define TEST_IR_VCC_TEST GPIO_NUM_18
-    #define TEST_IR_GND GPIO_NUM_26 // TODO - also VanBus ANALYSER_PIN
+    #define TEST_IR_VCC_TEST GPIO_NUM_19
+    #define TEST_IR_GND GPIO_NUM_18
    #endif
   #else
     #define TEST_IR_RECV_PIN D7
-    #define TEST_IR_VCC_TEST D5
-    #define TEST_IR_GND D0
+    #define TEST_IR_VCC_TEST D6
+    #define TEST_IR_GND D5
   #endif // ARDUINO_ARCH_ESP32
 
   #ifdef ARDUINO_ARCH_ESP32

VanLiveConnect/Sleep.ino

@@ -37,6 +37,7 @@ void SetupSleep()
   #else
     gpio_pin_wakeup_disable();
     pinMode(LIGHT_SLEEP_WAKE_PIN, INPUT_PULLUP);
+    pinMode(LIGHT_SLEEP_WAKE_PIN_ALT, INPUT_PULLUP);
 
   #endif // ARDUINO_ARCH_ESP32
 } // SetupSleep
@@ -46,6 +47,7 @@ void WakeupCallback()
 {
     gpio_pin_wakeup_disable();
     pinMode(LIGHT_SLEEP_WAKE_PIN, INPUT_PULLUP);
+    pinMode(LIGHT_SLEEP_WAKE_PIN_ALT, INPUT_PULLUP);
 
     // Seems to help in decreasing the jitter on the VAN bus bit timings. But also seems to
     // deteriorate Wi-Fi connectivity.