mirror of
https://github.com/mikecarper/MeshCore.git
synced 2026-09-26 22:17:58 +00:00
agessaman
fcd92e985f
Replace the sparse Heltec V4 R8 observer home screen with a padded dark analytics dashboard, add manual display control, and make blanking a runtime setting. Dashboard (DISPLAY_ACTIVITY_DASHBOARD, the four R8 TFT observer envs): - RadioActivityWindow: 20 one-minute buckets of valid RX packets, no heap. The caller's 32-bit millis() is extended to a monotonic 64-bit clock, so nothing downstream has a rollover case; an always-on node passes 2^32 ms after ~49.7 days, which would otherwise re-enter warm-up and divide 20 minutes of traffic by seconds. Rates use 19 whole minutes plus the elapsed part of the current one rather than a fixed 1200 s. - ObserverDashboard: header, radio strip, headline totals, a 20-bar packets-per-minute graph and RF/status footers, with separate portrait and landscape layouts. A text row is a fixed 16 px, which is 3.2 logical units in portrait but 4.27 in landscape, so one shared grid would overlap. Text is trimmed by character budget, not measured width: getTextWidth() reports an over-long string at the portrait driver's fallback scale, so DisplayDriver::drawTextEllipsized() under-trims and the row renders at half height. - Six per-row signatures computed from what is actually drawn, so only the rows whose pixels changed repaint. No startFrame(), no whole-screen clear. Link state moved out of the full-frame signature, so a DHCP renewal or WiFi flap repaints one footer row instead of the panel. - Dark theme by retuning the UIColor statics at runtime, which needs no display-driver edit and carries boot, setup, reboot and power-off with it. Touch and button (DISPLAY_TOUCH_TOGGLE): - CHSC6X at I2C 0x2E, polled; TP_INT is unusable (optional R13, and GPIO 43 is U0TXD). The point-count byte is tested against a valid count, never against non-zero: an idle read returns 0xFF, which reads as a finger held down forever and latches the tap detector after one event. - turnOff() no longer parks PIN_TFT_RST low on this board. GPIO 21 is a shared LCD_RST/TP_RST net, so doing that held the touch controller in reset for as long as the display was off. Verified against Heltec's expansion-board and mainboard schematics and the V4-R8 datasheet pinout, which also correct the pin comment in HeltecV4R8Board.cpp. - The USER button click now toggles the display too; it previously did nothing whenever the display was already on. display.timeout: - `set display.timeout <secs>` / `get display.timeout`, 0 = stay on, 60 s default, 3600 max. Read live, so a change applies without a reboot and restarts the countdown rather than firing on the old deadline. - Stored in MQTTPrefs (/mqtt.json), keeping NodePrefs aligned with upstream. Runtime-only: LegacyV1MQTTPrefs and the four frozen binary payload sizes are unchanged. No JSON format-version bump - the loader skips keys no def() claims, so older firmware reads newer files and this firmware reads older ones with the default applied. Both directions are covered by tests. - Joins the observer atomic-setter contract, so a failed save rolls the live value back instead of only claiming to. New periodic work uses a wrap-safe deadline check; `millis() >= deadline` fires every loop for a whole interval before each rollover. Adds test_radio_activity_window, test_observer_dashboard (driving the real renderer against a recording DisplayDriver in both orientation profiles) and test_touch_tap_detector. 440 native cases pass.
114 lines
3.1 KiB
C++
114 lines
3.1 KiB
C++
#include "HeltecV4R8Board.h"
|
|
|
|
#if defined(HELTEC_V4_R8_TFT) && defined(DISPLAY_CLASS)
|
|
#include <target.h>
|
|
#endif
|
|
|
|
void HeltecV4R8Board::begin() {
|
|
ESP32Board::begin();
|
|
|
|
periph_power.begin();
|
|
periph_power.claim(); // R8 VEXT also feeds the LoRa antenna boost rail.
|
|
|
|
loRaFEMControl.init();
|
|
|
|
// Expansion Kit V2 display/touch pins, verified against Heltec's
|
|
// Expansion_board_V2.03 schematic and the V4-R8 datasheet pinout:
|
|
// GPIO 17/18 TP_SDA / TP_SCL - the module's OLED_SDA/OLED_SCL I2C bus
|
|
// GPIO 21 LCD_RST *and* TP_RST on one net (the module's OLED_RST)
|
|
// GPIO 43 TP_INT, optional via R13, and also U0TXD
|
|
// GPIO 44 LCD_LEDK backlight, also U0RXD
|
|
// ST7789LCDDisplay owns GPIO 21, so there is no separate touch reset to do
|
|
// here - and because that net is shared, it must not be parked low while the
|
|
// display is off or the touch controller is held in reset with it.
|
|
|
|
esp_reset_reason_t reason = esp_reset_reason();
|
|
if (reason == ESP_RST_DEEPSLEEP) {
|
|
long wakeup_source = esp_sleep_get_ext1_wakeup_status();
|
|
if (wakeup_source & (1 << P_LORA_DIO_1)) {
|
|
startup_reason = BD_STARTUP_RX_PACKET;
|
|
}
|
|
|
|
rtc_gpio_hold_dis((gpio_num_t)P_LORA_NSS);
|
|
rtc_gpio_deinit((gpio_num_t)P_LORA_DIO_1);
|
|
}
|
|
}
|
|
|
|
void HeltecV4R8Board::onBeforeTransmit(void) {
|
|
digitalWrite(P_LORA_TX_LED, HIGH);
|
|
loRaFEMControl.setTxModeEnable();
|
|
}
|
|
|
|
void HeltecV4R8Board::onAfterTransmit(void) {
|
|
digitalWrite(P_LORA_TX_LED, LOW);
|
|
loRaFEMControl.setRxModeEnable();
|
|
}
|
|
|
|
void HeltecV4R8Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
|
|
#if defined(HELTEC_V4_R8_TFT) && defined(DISPLAY_CLASS)
|
|
display.turnOff();
|
|
#endif
|
|
|
|
esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
|
|
|
|
rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
|
|
rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
|
|
|
|
rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
|
|
loRaFEMControl.setRxModeEnableWhenMCUSleep();
|
|
|
|
if (pin_wake_btn < 0) {
|
|
esp_sleep_enable_ext1_wakeup((1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH);
|
|
} else {
|
|
esp_sleep_enable_ext1_wakeup((1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);
|
|
}
|
|
|
|
if (secs > 0) {
|
|
esp_sleep_enable_timer_wakeup(secs * 1000000);
|
|
}
|
|
|
|
esp_deep_sleep_start();
|
|
}
|
|
|
|
void HeltecV4R8Board::powerOff() {
|
|
enterDeepSleep(0);
|
|
}
|
|
|
|
uint16_t HeltecV4R8Board::getBattMilliVolts() {
|
|
analogReadResolution(12);
|
|
|
|
uint32_t raw = 0;
|
|
for (int i = 0; i < 8; i++) {
|
|
raw += analogReadMilliVolts(PIN_VBAT_READ);
|
|
}
|
|
raw = raw / 8;
|
|
|
|
return (adc_mult * raw);
|
|
}
|
|
|
|
const char* HeltecV4R8Board::getManufacturerName() const {
|
|
#ifdef HELTEC_V4_R8_TFT
|
|
return "Heltec V4 R8 TFT";
|
|
#else
|
|
return "Heltec V4 R8 OLED";
|
|
#endif
|
|
}
|
|
|
|
bool HeltecV4R8Board::setLoRaFemLnaEnabled(bool enable) {
|
|
if (!loRaFEMControl.isLnaCanControl()) {
|
|
return false;
|
|
}
|
|
|
|
loRaFEMControl.setLNAEnable(enable);
|
|
loRaFEMControl.setRxModeEnable();
|
|
return true;
|
|
}
|
|
|
|
bool HeltecV4R8Board::canControlLoRaFemLna() const {
|
|
return loRaFEMControl.isLnaCanControl();
|
|
}
|
|
|
|
bool HeltecV4R8Board::isLoRaFemLnaEnabled() const {
|
|
return loRaFEMControl.isLNAEnabled();
|
|
}
|