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

Reformat code

Browse source
This commit is contained in:
Laura Hausmann 2023-02-08 16:42:47 +01:00
parent 72ae2d0c75
commit f5d6a55b97
Signed by: zotan
GPG key ID: D044E84C5BE01605
11 changed files with 505 additions and 503 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AfRApay.MateCard/src/cardReader.cpp
View file

@ -4,7 +4,9 @@
#include "utils.h"
#include "cardReader.h"
MFRC522CardReader::MFRC522CardReader(MFRC522 *reader) { iReader = reader; }
MFRC522CardReader::MFRC522CardReader(MFRC522 *reader) {
iReader = reader;
}
bool MFRC522CardReader::isNewCardPresent() {
return iReader->PICC_IsNewCardPresent() && iReader->PICC_ReadCardSerial();
@ -14,7 +16,9 @@ String MFRC522CardReader::getCardUid() {
return byteArrayAsHexString(iReader->uid.uidByte, iReader->uid.size);
}
RDM6300CardReader::RDM6300CardReader(Rdm6300 *reader) { iReader = reader; }
RDM6300CardReader::RDM6300CardReader(Rdm6300 *reader) {
iReader = reader;
}
bool RDM6300CardReader::isNewCardPresent() {
return iReader->get_new_tag_id();

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

@ -22,18 +22,17 @@
//MFRC522 pinout (front) 3V3 RST GND IRQ MISO MOSI SCK SDA
//MFRC522 pinout (rear) SDA SCK MOSI MISO IRQ GND RST 3V3
#define PIN_HWSERIAL_RX 16
#define PIN_HWSERIAL_TX 17
#define HSPI_RST 4
#define HSPI_MISO 12
#define HSPI_MOSI 13
#define HSPI_SCLK 14
#define HSPI_SS 15
#define HSPI_RST 4
#define PIN_HWSERIAL_RX 16
#define PIN_HWSERIAL_TX 17
#define PIN_BUZZER 19
//#define PIN_OLED_SDA 21
//#define PIN_OLED_SCL 22
#define PIN_OLED_SDA 21
#define PIN_OLED_SCL 22
#define PIN_INTERRUPT_TRANSACT 26
#define PIN_INTERRUPT_BALANCE 25
#define PIN_INTERRUPT_LINK 33
@ -142,7 +141,7 @@ void loop() {
break;
case STATE_TRANSACT_CARDSCAN:
for (CardReader *reader : readers) {
if (reader->isNewCardPresent()){
if (reader->isNewCardPresent()) {
scannedCardId = reader->getCardUid();
lastStatusText = "Card #" + scannedCardId;
state = STATE_TRANSACT_VERIFY;
@ -173,7 +172,7 @@ void loop() {
return;
case STATE_LINK_CARDSCAN:
for (CardReader *reader : readers) {
if (reader->isNewCardPresent()){
if (reader->isNewCardPresent()) {
scannedCardId = reader->getCardUid();
lastStatusText = "Card #" + scannedCardId;
state = STATE_LINK_VERIFY;
@ -205,7 +204,7 @@ void loop() {
return;
case STATE_BALANCE_CARDSCAN:
for (CardReader *reader : readers) {
if (reader->isNewCardPresent()){
if (reader->isNewCardPresent()) {
scannedCardId = reader->getCardUid();
lastStatusText = "Card #" + scannedCardId;
state = STATE_BALANCE_VERIFY;

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

@ -6,16 +6,15 @@
void WiFiClientFixed::flush() {
int res;
size_t a = available(), toRead = 0;
size_t a = available();
if (!a) {
return;//nothing to flush
}
uint8_t *buf = (uint8_t *) malloc(WIFI_CLIENT_FLUSH_BUFFER_SIZE);
auto *buf = (uint8_t *) malloc(WIFI_CLIENT_FLUSH_BUFFER_SIZE);
if (!buf) {
return;//memory error
}
while (a) {
toRead = (a > WIFI_CLIENT_FLUSH_BUFFER_SIZE) ? WIFI_CLIENT_FLUSH_BUFFER_SIZE : a;
// override broken WiFiClient flush method, ref https://github.com/espressif/arduino-esp32/issues/6129#issuecomment-1237417915
//res = recv(fd(), buf, toRead, MSG_DONTWAIT);
res = read(buf, a);