From ba8024c0d28d97cd02052bd178bf528fd2a3e576 Mon Sep 17 00:00:00 2001
From: "Limor \"Ladyada\" Fried" <limor@ladyada.net>
Date: Mon, 14 Mar 2022 06:45:16 -0400
Subject: [PATCH] Some board variant fixes (#6411)

* make work with rev C pcb

* use #define for easy testing
---
 variants/adafruit_feather_esp32_v2/pins_arduino.h | 13 ++++++-------
 variants/adafruit_feather_esp32s2/variant.cpp     |  9 +++++----
 variants/adafruit_qtpy_esp32c3/pins_arduino.h     |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/variants/adafruit_feather_esp32_v2/pins_arduino.h b/variants/adafruit_feather_esp32_v2/pins_arduino.h
index f984baf5..97a09dba 100644
--- a/variants/adafruit_feather_esp32_v2/pins_arduino.h
+++ b/variants/adafruit_feather_esp32_v2/pins_arduino.h
@@ -42,20 +42,19 @@ static const uint8_t A9 = 33;
 static const uint8_t A10 = 27;
 static const uint8_t A11 = 12;
 static const uint8_t A12 = 13;
-
-// vbat measure
-static const uint8_t BATT_MONITOR = 35;
 static const uint8_t A13 = 35;
 
+// vbat measure
+#define BATT_MONITOR 35
+
 // internal switch
-static const uint8_t BUTTON = 38;
+#define BUTTON = 38;
 
 // Neopixel
-static const uint8_t NEOPIXEL_PIN = 0;
-static const uint8_t PIN_NEOPIXEL = 0;
+#define PIN_NEOPIXEL 0
 
 // Neopixel & I2C power
-static const uint8_t NEOPIXEL_I2C_POWER = 2;
+#define NEOPIXEL_I2C_POWER 2
 
 static const uint8_t T0 = 4;
 static const uint8_t T1 = 0;
diff --git a/variants/adafruit_feather_esp32s2/variant.cpp b/variants/adafruit_feather_esp32s2/variant.cpp
index 97e26fb9..069f7351 100644
--- a/variants/adafruit_feather_esp32s2/variant.cpp
+++ b/variants/adafruit_feather_esp32s2/variant.cpp
@@ -36,10 +36,11 @@ void initVariant(void)
   pinMode(NEOPIXEL_POWER, OUTPUT);
   digitalWrite(NEOPIXEL_POWER, HIGH);
 
-  // This board has a power control pin, and we must set it to output and low
-  // in order to enable the I2C port.
+  // turn on the I2C power by setting pin to opposite of 'rest state'
+  pinMode(PIN_I2C_POWER, INPUT);
+  delay(1);
+  bool polarity = digitalRead(PIN_I2C_POWER);
   pinMode(PIN_I2C_POWER, OUTPUT);
-  digitalWrite(PIN_I2C_POWER, LOW);
+  digitalWrite(PIN_I2C_POWER, !polarity);
 }
-
 }
diff --git a/variants/adafruit_qtpy_esp32c3/pins_arduino.h b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
index c0f1aefc..6c93bfd5 100644
--- a/variants/adafruit_qtpy_esp32c3/pins_arduino.h
+++ b/variants/adafruit_qtpy_esp32c3/pins_arduino.h
@@ -11,8 +11,8 @@
 #define digitalPinToInterrupt(p)    (((p)<NUM_DIGITAL_PINS)?(p):-1)
 #define digitalPinHasPWM(p)         (p < EXTERNAL_NUM_INTERRUPTS)
 
-static const uint8_t SWITCH = 9;
-static const uint8_t NEOPIXEL_PIN = 2;
+#define BUTTON 9
+#define PIN_NEOPIXEL 2
 
 static const uint8_t TX = 21;
 static const uint8_t RX = 20;