AfRA/AfRApay
3
0
Fork 0
Code Issues 7 Pull requests Packages Projects Releases Wiki Activity

Display fake yen balance properly

Browse source
This commit is contained in:
Laura Hausmann 2023-04-22 15:28:25 +02:00
parent 70c3499e02
commit faa7d29451
Signed by: zotan
GPG key ID: D044E84C5BE01605
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
AfRApay.MateCard/src/main.cpp
View file

@ -350,7 +350,10 @@ void loop() {
case STATE_RESULT_FAILURE:
case STATE_RESULT_DISPLAY:
if (!cooldownCheck(gTimeout)) {
oled.updateOLED(state, lastStatusText, String(cooldownSecondsRemaining(gTimeout, timer)));
if (PN532Reader::mode == PN532_MIFARE_ISO14443A)
oled.updateOLED(state, lastStatusText, String(cooldownSecondsRemaining(gTimeout, timer)));
else
oled.updateOLED(state, lastStatusText, String(cooldownSecondsRemaining(gTimeout, timer)), true);
}
break;
}

21
AfRApay.MateCard/src/oled.cpp
View file

@ -153,7 +153,26 @@ void OLED::updateOLED(e_state state, const String& statusText, const String& sta
drawLogo(LOGO_FAILURE);
break;
case STATE_RESULT_DISPLAY:
drawFullScreenText(splitString(statusText, ':', 0), splitString(statusText, ':', 1) + "€");
if (japan) {
String balance = splitString(statusText, ':', 1);
balance.replace(",", "");
if (balance.startsWith("-")) {
balance.replace("-00", "-");
balance.replace("-0", "-");
balance.replace("-", "-¥");
}
else {
if (balance.startsWith("00"))
balance = balance.substring(2);
else if (balance.startsWith("0"))
balance = balance.substring(1);
balance = "¥" + balance;
}
drawFullScreenText(splitString(statusText, ':', 0), balance);
}
else
drawFullScreenText(splitString(statusText, ':', 0), splitString(statusText, ':', 1) + "€");
drawStatusText(splitString(statusText, ':', 2), statusTextRightAligned);
u8g2.sendBuffer();
return;