Skip to content

Feature/better status report #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
nGoline wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Feature/better status report #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e31bc42
move `uiController.begin();` up so we have a ui on power up
nGoline Feb 10, 2025
ebc4ecf
warn user about config might not be initialized
nGoline Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion lib/UIController/UIController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ void UIController::run()
break;
}
}
else
else if (isInitialized)
{
lv_obj_clear_flag(ui_homeErrorPanel, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(ui_homeButton, LV_OBJ_FLAG_HIDDEN);
Expand All @@ -163,6 +163,15 @@ void UIController::run()
lv_label_set_text(ui_homeErrorTitle, "Conectando ao WiFi e LNBits...");
lv_label_set_text(ui_homeErrorSubTitle, "Aguarde...\n");
}
else
{
lv_obj_clear_flag(ui_homeErrorPanel, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(ui_homeButton, LV_OBJ_FLAG_HIDDEN);
lv_obj_add_flag(ui_homeSubTitle, LV_OBJ_FLAG_HIDDEN);
lv_img_set_src(ui_homeErrorIcon, &ui_img_wifi_png);
lv_label_set_text(ui_homeErrorTitle, "Já configurou sua máquina café?");
lv_label_set_text(ui_homeErrorSubTitle, "Por favor, aguarde alguns segundos ou conecte-se ao AP para ajustar as configurações iniciais.");
}

delayLvgl = lv_timer_handler();
vTaskDelay(delayLvgl + 1 / portTICK_PERIOD_MS);
Expand Down
2 changes: 2 additions & 0 deletions lib/UIController/UIController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ class UIController
void clearQrCode();
void setWaitingPaymentFor(uint8_t type);
uint8_t getDelayLvgl() const { return delayLvgl; };
void setIsInitialized(bool isInitialized) { UIController::isInitialized = isInitialized; }

static void task(void *pvParameters);

Expand All @@ -30,6 +31,7 @@ class UIController
uint8_t timerButtonNumber;
uint8_t waitingPaymentFor = 0;
uint8_t delayLvgl = 0;
bool isInitialized = false;

static void qrCodeTimerCallback(lv_timer_t *timer);

Expand Down
5 changes: 4 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ void setup()
log_i("'q' - Set Quantity");
#endif

uiController.begin();

if (!configManager.begin())
{
log_e("Failed to initialize config manager");
Expand All @@ -51,19 +53,20 @@ void setup()
}

initialized = true;
uiController.setIsInitialized(true);

log_i("WiFi connected.");

lightningController.websocketInit();

coffeeTask.begin();
uiController.begin();
}

void loop()
{
if (!initialized)
return;

wifiManager.process();

lightningController.websocketLoop();
Expand Down