From 6cbe39dca9e9c7943a8afed871bdb1abcb4b26c0 Mon Sep 17 00:00:00 2001 From: Christophe Robillard Date: Tue, 23 Dec 2025 14:33:03 +0100 Subject: [PATCH] refacto --- the-cup.ino | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/the-cup.ino b/the-cup.ino index ea4786e..7c1d7a5 100644 --- a/the-cup.ino +++ b/the-cup.ino @@ -19,7 +19,6 @@ #include #include -#define LED_PIN LED_BUILTIN #define SS_PIN SDA #define RC522_POWER_PIN 1 #define SLEEP_DURATION 1 @@ -71,20 +70,19 @@ void send_uid(char reader_uid[]); void setup() { Serial.begin(115200); - delay(1000); - - pinMode(LED_PIN, OUTPUT); + while (!Serial) delay(10); pinMode(RC522_POWER_PIN, OUTPUT); - digitalWrite(RC522_POWER_PIN, HIGH); reader.PCD_Init(); // Init each MFRC522 card. } void loop() { + digitalWrite(RC522_POWER_PIN, HIGH); + if (reader.PICC_IsNewCardPresent() && reader.PICC_ReadCardSerial()) { char reader_uid[32] = ""; - read_card(reader_uid); - send_uid(reader_uid); + readCard(reader_uid); + sendUid(reader_uid); } else { delay(200); @@ -93,7 +91,7 @@ void loop() { } } -void read_card(char reader_uid[]) { +void readCard(char reader_uid[]) { reader.PICC_HaltA(); reader.PCD_StopCrypto1(); byte_to_string(reader.uid.uidByte, 4, reader_uid); @@ -101,7 +99,12 @@ void read_card(char reader_uid[]) { displaySuccess(); } -void send_uid(char reader_uid[]) { +void sendUid(char reader_uid[]) { + connectToWifi(); + postUid(reader_uid); +} + +void connectToWifi() { WiFiManager wm; bool res; res = wm.autoConnect("KLUK"); // password protected ap @@ -115,6 +118,8 @@ void send_uid(char reader_uid[]) { //if you get here you have connected to the WiFi Serial.println("connected...yeey :)"); } +} +void postUid(char reader_uid[]) { NetworkClientSecure *client = new NetworkClientSecure; client->setCACert(rootCACertificate); HTTPClient https; @@ -155,7 +160,7 @@ void byte_to_string(byte array[], unsigned int len, char buffer[]) { } void displayError() { - rgbLedWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Green + rgbLedWrite(RGB_BUILTIN, RGB_BRIGHTNESS, 0, 0); // Red delay(1000); } @@ -163,13 +168,3 @@ void displaySuccess() { rgbLedWrite(RGB_BUILTIN, 0, RGB_BRIGHTNESS, 0); // Green delay(1000); } - -void blink(unsigned int times, unsigned int duration) { - for (unsigned int i = 0; i < times; i++) - { - digitalWrite(LED_PIN, HIGH); - delay(duration); - digitalWrite(LED_PIN, LOW); - delay(duration); - } -}