meshcore-dev/MeshCore
1
0
Fork 0
mirror of https://github.com/meshcore-dev/MeshCore.git synced 2026-04-20 22:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanups (remove statics and typos)

Browse source
This commit is contained in:
Florent 2025-09-03 17:22:11 +02:00
parent 3cdf2f9b4d
commit cb3049e706
4 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
examples/companion_radio/ui-new/UITask.cpp
View file

@ -419,38 +419,34 @@ void UITask::newMsg(uint8_t path_len, const char* from_name, const char* text, i
if (_display != NULL) { if (_display != NULL) {
if (!_display->isOn()) _display->turnOn(); if (!_display->isOn()) _display->turnOn();
_auto_off = millis() + AUTO_OFF_MILLIS; // extend the auto-off timer _auto_off = millis() + AUTO_OFF_MILLIS; // extend the auto-off timer
_next_refresh = 0; // trigger refresh _next_refresh = 100; // trigger refresh
} }
} }
void UITask::userLedHandler() { void UITask::userLedHandler() {
#ifdef PIN_STATUS_LED #ifdef PIN_STATUS_LED
static int state = 0;
static int next_change = 0;
static int last_increment = 0;
int cur_time = millis(); int cur_time = millis();
if (cur_time > next_change) { if (cur_time > next_led_change) {
if (state == 0) { if (led_state == 0) {
state = 1; led_state = 1;
if (_msgcount > 0) { if (_msgcount > 0) {
last_increment = LED_ON_MSG_MILLIS; last_led_increment = LED_ON_MSG_MILLIS;
} else { } else {
last_increment = LED_ON_MILLIS; last_led_increment = LED_ON_MILLIS;
} }
next_change = cur_time + last_increment; next_led_change = cur_time + last_led_increment;
} else { } else {
state = 0; led_state = 0;
next_change = cur_time + LED_CYCLE_MILLIS - last_increment; next_led_change = cur_time + LED_CYCLE_MILLIS - last_led_increment;
} }
digitalWrite(PIN_STATUS_LED, state); digitalWrite(PIN_STATUS_LED, led_state);
} }
#endif #endif
} }
void UITask::setCurrScreen(UIScreen* c) { void UITask::setCurrScreen(UIScreen* c) {
curr = c; curr = c;
_next_refresh = 0; _next_refresh = 100;
} }
/* /*
@ -520,18 +516,17 @@ void UITask::loop() {
} }
#endif #endif
#if defined(DISP_BACKLIGHT) && defined(BACKLIGHT_BTN) #if defined(DISP_BACKLIGHT) && defined(BACKLIGHT_BTN)
static int next_btn_check = 0; if (millis() > next_backlight_btn_check) {
if (millis() > next_btn_check) {
bool touch_state = digitalRead(PIN_BUTTON2); bool touch_state = digitalRead(PIN_BUTTON2);
digitalWrite(DISP_BACKLIGHT, !touch_state); digitalWrite(DISP_BACKLIGHT, !touch_state);
next_btn_check = millis() + 300; next_backlight_btn_check = millis() + 300;
} }
#endif #endif
if (c != 0 && curr) { if (c != 0 && curr) {
curr->handleInput(c); curr->handleInput(c);
_auto_off = millis() + AUTO_OFF_MILLIS; // extend auto-off timer _auto_off = millis() + AUTO_OFF_MILLIS; // extend auto-off timer
_next_refresh = 0; // trigger refresh _next_refresh = 100; // trigger refresh
} }
userLedHandler(); userLedHandler();

6
examples/companion_radio/ui-new/UITask.h
View file

@ -26,6 +26,12 @@ class UITask : public AbstractUITask {
unsigned long _alert_expiry; unsigned long _alert_expiry;
int _msgcount; int _msgcount;
unsigned long ui_started_at, next_batt_chck; unsigned long ui_started_at, next_batt_chck;
int next_backlight_btn_check = 0;
#ifdef PIN_STATUS_LED
int led_state = 0;
int next_led_change = 0;
int last_led_increment = 0;
#endif
UIScreen* splash; UIScreen* splash;
UIScreen* home; UIScreen* home;

2
src/helpers/ui/GxEPDDisplay.cpp
View file

@ -28,7 +28,7 @@ bool GxEPDDisplay::begin() {
void GxEPDDisplay::turnOn() { void GxEPDDisplay::turnOn() {
if (!_init) begin(); if (!_init) begin();
#if defined(DISP_BACKLIGHT) && !defined(BACLIGHT_BTN) #if defined(DISP_BACKLIGHT) && !defined(BACKLIGHT_BTN)
digitalWrite(DISP_BACKLIGHT, HIGH); digitalWrite(DISP_BACKLIGHT, HIGH);
#endif #endif
_isOn = true; _isOn = true;

1
variants/techo/platformio.ini
View file

@ -92,3 +92,4 @@ lib_deps =
${LilyGo_Techo.lib_deps} ${LilyGo_Techo.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
zinggjm/GxEPD2 @ 1.6.2 zinggjm/GxEPD2 @ 1.6.2
bakercp/CRC32 @ ^2.0.0