diff --git a/src/helpers/TBeamBoard.h b/src/helpers/TBeamBoard.h index 6c6367fa..fc52e712 100644 --- a/src/helpers/TBeamBoard.h +++ b/src/helpers/TBeamBoard.h @@ -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 { diff --git a/src/helpers/nrf52/TechoBoard.cpp b/src/helpers/nrf52/TechoBoard.cpp index 13a250e6..dee14688 100644 --- a/src/helpers/nrf52/TechoBoard.cpp +++ b/src/helpers/nrf52/TechoBoard.cpp @@ -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); diff --git a/variants/techo/variant.cpp b/variants/techo/variant.cpp index 3d3dc9c1..7b7bee95 100644 --- a/variants/techo/variant.cpp +++ b/variants/techo/variant.cpp @@ -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); } diff --git a/variants/techo/variant.h b/variants/techo/variant.h index 8fcb765e..9f4da8e7 100644 --- a/variants/techo/variant.h +++ b/variants/techo/variant.h @@ -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)