mirror of
https://github.com/meshtastic/firmware.git
synced 2025-04-30 19:29:17 +00:00
Merge pull request #3925 from meshtastic/init-variant
PLEASE TEST move the power rail init earlier in the startup process on 4630
This commit is contained in:
commit
300b26c6b5
11
src/main.cpp
11
src/main.cpp
@ -360,18 +360,11 @@ void setup()
|
|||||||
delay(1);
|
delay(1);
|
||||||
#endif
|
#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
|
#ifdef AQ_SET_PIN
|
||||||
// RAK-12039 set pin for Air quality sensor
|
// RAK-12039 set pin for Air quality sensor
|
||||||
pinMode(AQ_SET_PIN, OUTPUT);
|
pinMode(AQ_SET_PIN, OUTPUT);
|
||||||
digitalWrite(AQ_SET_PIN, HIGH);
|
digitalWrite(AQ_SET_PIN, HIGH);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef T_DECK
|
#ifdef T_DECK
|
||||||
// enable keyboard
|
// enable keyboard
|
||||||
@ -548,10 +541,6 @@ void setup()
|
|||||||
setupSDCard();
|
setupSDCard();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef RAK4630
|
|
||||||
// scanEInkDevice();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// LED init
|
// LED init
|
||||||
|
|
||||||
#ifdef LED_PIN
|
#ifdef LED_PIN
|
||||||
|
@ -38,4 +38,8 @@ void initVariant()
|
|||||||
|
|
||||||
pinMode(PIN_LED2, OUTPUT);
|
pinMode(PIN_LED2, OUTPUT);
|
||||||
ledOff(PIN_LED2);
|
ledOff(PIN_LED2);
|
||||||
|
|
||||||
|
// 3V3 Power Rail
|
||||||
|
pinMode(PIN_3V3_EN, OUTPUT);
|
||||||
|
digitalWrite(PIN_3V3_EN, HIGH);
|
||||||
}
|
}
|
@ -38,4 +38,8 @@ void initVariant()
|
|||||||
|
|
||||||
pinMode(PIN_LED2, OUTPUT);
|
pinMode(PIN_LED2, OUTPUT);
|
||||||
ledOff(PIN_LED2);
|
ledOff(PIN_LED2);
|
||||||
|
|
||||||
|
// 3V3 Power Rail
|
||||||
|
pinMode(PIN_3V3_EN, OUTPUT);
|
||||||
|
digitalWrite(PIN_3V3_EN, HIGH);
|
||||||
}
|
}
|
||||||
|
@ -38,4 +38,8 @@ void initVariant()
|
|||||||
|
|
||||||
pinMode(PIN_LED2, OUTPUT);
|
pinMode(PIN_LED2, OUTPUT);
|
||||||
ledOff(PIN_LED2);
|
ledOff(PIN_LED2);
|
||||||
|
|
||||||
|
// 3V3 Power Rail
|
||||||
|
pinMode(PIN_3V3_EN, OUTPUT);
|
||||||
|
digitalWrite(PIN_3V3_EN, HIGH);
|
||||||
}
|
}
|
||||||
|
@ -38,4 +38,8 @@ void initVariant()
|
|||||||
|
|
||||||
pinMode(PIN_LED2, OUTPUT);
|
pinMode(PIN_LED2, OUTPUT);
|
||||||
ledOff(PIN_LED2);
|
ledOff(PIN_LED2);
|
||||||
|
|
||||||
|
// 3V3 Power Rail
|
||||||
|
pinMode(PIN_3V3_EN, OUTPUT);
|
||||||
|
digitalWrite(PIN_3V3_EN, HIGH);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user