MakerLab/Atm-Automat
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added counter for payment confirment

Browse source
This commit is contained in:
niklas 2025-03-24 20:44:32 +01:00
parent c54a0c07cc
commit 203a59d8b9
3 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
firmware/include/epaperdisplay.h
View file

@ -53,6 +53,7 @@ class EpaperDisplay
void updateText(const char* text, uint16_t x, uint16_t y); void updateText(const char* text, uint16_t x, uint16_t y);
void updateText(const char* text, uint8_t textSize, uint16_t x, uint16_t y, uint16_t fgColor, uint16_t bgColor); void updateText(const char* text, uint8_t textSize, uint16_t x, uint16_t y, uint16_t fgColor, uint16_t bgColor);
void qrCode(const char* content, const char* sumValue); void qrCode(const char* content, const char* sumValue);
void update_ok_counter(uint8_t ok_counter);
}; };

26
firmware/src/epaperdisplay.cpp
View file

@ -320,15 +320,35 @@ void EpaperDisplay::qrCode(const char* content, const char* sumValue)
uint16_t radius_px = 5; uint16_t radius_px = 5;
epDisplay->drawRoundRect(qr.start_x - radius_px , qr.start_y - radius_px, qr.qr_size+(2*radius_px), qr.qr_size+(2*radius_px), radius_px, GxEPD_BLACK); epDisplay->drawRoundRect(qr.start_x - radius_px , qr.start_y - radius_px, qr.qr_size+(2*radius_px), qr.qr_size+(2*radius_px), radius_px, GxEPD_BLACK);
drawXCenteredText("Please scan the QR code!\n", 1, 10, GxEPD_BLACK, GxEPD_WHITE ); drawXCenteredText("Bitte scanne den QR-Code!\n", 1, 20, GxEPD_BLACK, GxEPD_WHITE );
drawXCenteredText("This will transfer the paid value to your wallet.\n", 1, 30, GxEPD_BLACK, GxEPD_WHITE ); drawXCenteredText("Das Geld wird auf\n", 1, 40, GxEPD_BLACK, GxEPD_WHITE );
drawXCenteredText("Reset - press button\n", 1, epDisplay->height() - 20, GxEPD_BLACK, GxEPD_WHITE ); drawXCenteredText("deine Wallet geladen.\n", 1, 60, GxEPD_BLACK, GxEPD_WHITE );
drawXCenteredText("Gescannt? - Druecke 4 mal OK!", 1, epDisplay->height() - 20, GxEPD_BLACK, GxEPD_WHITE );
/* code */ /* code */
} while (epDisplay->nextPage()); } while (epDisplay->nextPage());
epDisplay->hibernate(); epDisplay->hibernate();
} }
void EpaperDisplay::update_ok_counter(uint8_t ok_counter)
{
switch(ok_counter)
{
case 1:
updateText(" ",199,epDisplay->height() - 20);
updateText("3", 1, 199, epDisplay->height() - 20, GxEPD_BLACK, GxEPD_WHITE);
break;
case 2:
updateText(" ",199,epDisplay->height() - 20);
updateText("2",199,epDisplay->height() - 20);
break;
case 3:
updateText(" ",199,epDisplay->height() - 20);
updateText("1",199,epDisplay->height() - 20);
break;
}
}
void EpaperDisplay::cancelScreen() void EpaperDisplay::cancelScreen()
{ {

8
firmware/src/state.cpp
View file

@ -5,6 +5,7 @@
namespace { namespace {
std::string lnurl_str = ""; std::string lnurl_str = "";
bool update_value = false; bool update_value = false;
uint8_t ok_button_counter = 0;
static atm::State current_state = atm::State::INIT; static atm::State current_state = atm::State::INIT;
static atm::State next_state = atm::State::INIT; static atm::State next_state = atm::State::INIT;
@ -22,6 +23,7 @@ namespace atm {
switch (current_state) { switch (current_state) {
case INIT: case INIT:
update_value = false; update_value = false;
ok_button_counter = 0;
ok_button.ledOff(); ok_button.ledOff();
ok_button.reset(); ok_button.reset();
cancel_button.ledOff(); cancel_button.ledOff();
@ -78,8 +80,14 @@ namespace atm {
break; break;
case PAYMENT_CONFIRMED: case PAYMENT_CONFIRMED:
if (ok_button.wasPressed()) if (ok_button.wasPressed())
{
ok_button_counter++;
if(ok_button_counter == 4)
{ {
next_state = INIT; next_state = INIT;
break;
}
epDisp.update_ok_counter(ok_button_counter);
ok_button.reset(); ok_button.reset();
} }
break; break;