From 7ef9fec446b6a214d3c5ee39f8c1cb66695c7102 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= <tgoettgens@gmail.com>
Date: Fri, 17 May 2024 10:21:56 +0200
Subject: [PATCH] PLEASE TEST move the power rail init earlier in the startup
 process on 4630

---
 src/main.cpp                               | 11 -----------
 variants/monteops_hw1/variant.cpp          |  4 ++++
 variants/rak10701/variant.cpp              |  4 ++++
 variants/rak4631/variant.cpp               |  4 ++++
 variants/rak4631_epaper/variant.cpp        |  4 ++++
 variants/rak4631_epaper_onrxtx/variant.cpp |  4 ++++
 6 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 64ff92dd7..4a9fef5d0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -360,18 +360,11 @@ void setup()
     delay(1);
 #endif
 
-#ifdef RAK4630
-#ifdef PIN_3V3_EN
-    // We need to enable 3.3V periphery in order to scan it
-    pinMode(PIN_3V3_EN, OUTPUT);
-    digitalWrite(PIN_3V3_EN, HIGH);
-#endif
 #ifdef AQ_SET_PIN
     // RAK-12039 set pin for Air quality sensor
     pinMode(AQ_SET_PIN, OUTPUT);
     digitalWrite(AQ_SET_PIN, HIGH);
 #endif
-#endif
 
 #ifdef T_DECK
     // enable keyboard
@@ -548,10 +541,6 @@ void setup()
     setupSDCard();
 #endif
 
-#ifdef RAK4630
-    // scanEInkDevice();
-#endif
-
     // LED init
 
 #ifdef LED_PIN
diff --git a/variants/monteops_hw1/variant.cpp b/variants/monteops_hw1/variant.cpp
index 75cca1dc3..e84b60b3b 100644
--- a/variants/monteops_hw1/variant.cpp
+++ b/variants/monteops_hw1/variant.cpp
@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }
diff --git a/variants/rak10701/variant.cpp b/variants/rak10701/variant.cpp
index 2b4bd39a6..5a3587982 100644
--- a/variants/rak10701/variant.cpp
+++ b/variants/rak10701/variant.cpp
@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }
\ No newline at end of file
diff --git a/variants/rak4631/variant.cpp b/variants/rak4631/variant.cpp
index 75cca1dc3..e84b60b3b 100644
--- a/variants/rak4631/variant.cpp
+++ b/variants/rak4631/variant.cpp
@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }
diff --git a/variants/rak4631_epaper/variant.cpp b/variants/rak4631_epaper/variant.cpp
index 75cca1dc3..e84b60b3b 100644
--- a/variants/rak4631_epaper/variant.cpp
+++ b/variants/rak4631_epaper/variant.cpp
@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }
diff --git a/variants/rak4631_epaper_onrxtx/variant.cpp b/variants/rak4631_epaper_onrxtx/variant.cpp
index 75cca1dc3..e84b60b3b 100644
--- a/variants/rak4631_epaper_onrxtx/variant.cpp
+++ b/variants/rak4631_epaper_onrxtx/variant.cpp
@@ -38,4 +38,8 @@ void initVariant()
 
     pinMode(PIN_LED2, OUTPUT);
     ledOff(PIN_LED2);
+
+    // 3V3 Power Rail
+    pinMode(PIN_3V3_EN, OUTPUT);
+    digitalWrite(PIN_3V3_EN, HIGH);
 }