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

Fix Card ID display overflow

Browse source
This commit is contained in:
Laura Hausmann 2023-04-22 02:17:55 +02:00
parent 179cb05cbf
commit 9477f45e58
Signed by: zotan
GPG key ID: D044E84C5BE01605
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AfRApay.MateCard/include/utils.h
View file

@ -8,6 +8,7 @@ String cardLink(WiFiClient* wifi, HTTPClient* http, const String& apiUrl, const
String cardBalance(WiFiClient* wifi, HTTPClient* http, const String& apiUrl, const String& cardId);
String cardTransaction(WiFiClient* wifi, HTTPClient* http, const String& apiUrl, const String& cardId, const String& amount);
String splitString(const String& data, char separator, int index);
String cardIdDisplay(const String& id);
enum e_state {
STATE_IDLE,

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

@ -176,7 +176,7 @@ void loop() {
for (Reader* reader : readers) {
if (reader->isNewCardPresent()) {
scannedCardId = reader->getCardUid();
lastStatusText = "Card #" + scannedCardId;
lastStatusText = cardIdDisplay(scannedCardId);
scannedCardReader = reader;
state = STATE_TRANSACT_VERIFY;
return;
@ -215,7 +215,7 @@ void loop() {
return;
}
else {
lastStatusText = "Card #" + scannedCardId;
lastStatusText = cardIdDisplay(scannedCardId);
state = STATE_LINK_VERIFY;
return;
}
@ -228,7 +228,7 @@ void loop() {
case STATE_LINK_CARD_RESCAN:
if (scannedCardReader->isNewCardPresent()) {
if (scannedCardId == scannedCardReader->getCardUid()) {
lastStatusText = "Card #" + scannedCardId;
lastStatusText = cardIdDisplay(scannedCardId);
state = STATE_LINK_VERIFY;
return;
}
@ -265,7 +265,7 @@ void loop() {
for (Reader* reader : readers) {
if (reader->isNewCardPresent()) {
scannedCardId = reader->getCardUid();
lastStatusText = "Card #" + scannedCardId;
lastStatusText = cardIdDisplay(scannedCardId);
state = STATE_BALANCE_VERIFY;
return;
}
@ -280,7 +280,7 @@ void loop() {
tone(PIN_BUZZER, NOTE_NONE, 150);
lastStatusText = cardBalance(wifi, http, apiUrl, scannedCardId);
if (lastStatusText.startsWith("S:")) {
lastStatusText = lastStatusText + ":Card #" + scannedCardId;
lastStatusText = lastStatusText + ":" + cardIdDisplay(scannedCardId);
state = STATE_RESULT_DISPLAY;
} else {
tone(PIN_BUZZER, NOTE_CS5, 100);
@ -292,7 +292,7 @@ void loop() {
timer = millis();
case STATE_RESULT_SUCCESS:
if (cooldownSecondsRemaining(gTimeout, timer) <= 4) {
lastStatusText = lastStatusText + ":Card #" + scannedCardId;
lastStatusText = lastStatusText + ":" + cardIdDisplay(scannedCardId);
state = STATE_RESULT_DISPLAY;
}
case STATE_RESULT_FAILURE:

9
AfRApay.MateCard/src/utils.cpp
View file

@ -157,3 +157,12 @@ String cardTransaction(WiFiClient* wifi, HTTPClient* http, const String& apiUrl,
}
return String("E:Internal Error ") + httpResponseCode;
}
String cardIdDisplay(const String& id){
if (id.length() <= 14)
return "Card #" + id;
else if (id.length() <= 19)
return "#" + id;
else
return "#" + id.substring(0, 16) + "...";
}