Merge pull request #188 from recrof/dev

lilygo t-echo: disable gps to conserve battery, move init stuff to variant.cpp; lilygo t-beam: report battery voltage
This commit is contained in:
ripplebiz
2025-04-10 17:09:16 +10:00
committed by GitHub
4 changed files with 40 additions and 24 deletions

View File

@@ -33,11 +33,11 @@ class TBeamBoard : public ESP32Board {
public:
void begin() {
ESP32Board::begin();
power.setALDO2Voltage(3300);
power.enableALDO2();
pinMode(38,INPUT_PULLUP);
pinMode(38, INPUT_PULLUP);
esp_reset_reason_t reason = esp_reset_reason();
if (reason == ESP_RST_DEEPSLEEP) {
@@ -75,7 +75,7 @@ public:
}
uint16_t getBattMilliVolts() override {
return 0;
return power.getBattVoltage();
}
const char* getManufacturerName() const override {

View File

@@ -24,19 +24,6 @@ void TechoBoard::begin() {
// for future use, sub-classes SHOULD call this from their begin()
startup_reason = BD_STARTUP_NORMAL;
delay(200);
pinMode(PIN_PWR_EN, OUTPUT);
digitalWrite(PIN_PWR_EN, HIGH);
pinMode(PIN_BUTTON1, INPUT_PULLUP);
pinMode(PIN_BUTTON2, INPUT_PULLUP);
pinMode(LED_RED, OUTPUT);
pinMode(LED_GREEN, OUTPUT);
pinMode(LED_BLUE, OUTPUT);
delay(200);
pinMode(PIN_TXCO, OUTPUT);
digitalWrite(PIN_TXCO, HIGH);
Wire.begin();
pinMode(SX126X_POWER_EN, OUTPUT);

View File

@@ -9,14 +9,22 @@ const uint32_t g_ADigitalPinMap[] = {
40, 41, 42, 43, 44, 45, 46, 47
};
void initVariant()
{
void initVariant() {
pinMode(PIN_PWR_EN, OUTPUT);
digitalWrite(PIN_PWR_EN, HIGH);
pinMode(PIN_BUTTON1, INPUT_PULLUP);
pinMode(PIN_BUTTON2, INPUT_PULLUP);
pinMode(LED_RED, OUTPUT);
ledOff(LED_RED);
pinMode(LED_GREEN, OUTPUT);
ledOff(LED_GREEN);
pinMode(LED_BLUE, OUTPUT);
ledOff(LED_BLUE);
digitalWrite(LED_BLUE, HIGH);
pinMode(PIN_TXCO, OUTPUT);
digitalWrite(PIN_TXCO, HIGH);
// shutdown gps
pinMode(PIN_GPS_STANDBY, OUTPUT);
digitalWrite(PIN_GPS_STANDBY, LOW);
}

View File

@@ -42,7 +42,6 @@
#define PIN_SERIAL1_RX (41) // GPS TX
#define PIN_SERIAL1_TX (40) // GPS RX
////////////////////////////////////////////////////////////////////////////////
// I2C pin definition
@@ -100,3 +99,25 @@
#define PIN_SPI1_MISO (39)
#define PIN_SPI1_MOSI (29)
#define PIN_SPI1_SCK (31)
////////////////////////////////////////////////////////////////////////////////
// Display
#define DISP_MISO (38)
#define DISP_MOSI (29)
#define DISP_SCLK (31)
#define DISP_CS (30)
#define DISP_DC (28)
#define DISP_RST (2)
#define DISP_BUSY (3)
#define DISP_BACKLIGHT (43)
////////////////////////////////////////////////////////////////////////////////
// GPS
#define PIN_GPS_RX (41)
#define PIN_GPS_TX (40)
#define PIN_GPS_WAKEUP (34)
#define PIN_GPS_RESET (37)
#define PIN_GPS_PPS (36)
#define PIN_GPS_STANDBY (34)