From 838830bf4a935e9d08c7bc7663b1875831ca14dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ey=C3=BCp=20S=C3=BCyr=C3=BCge?= Date: Sun, 12 Nov 2023 17:36:17 +0100 Subject: [PATCH] arduino sketch modify --- docs/openapi.yml | 16 ++++----- src/arduino/card_scanner.ino | 68 +++++++++++++++++++++++------------- 2 files changed, 51 insertions(+), 33 deletions(-) diff --git a/docs/openapi.yml b/docs/openapi.yml index 3b7d4e7..e1d2446 100644 --- a/docs/openapi.yml +++ b/docs/openapi.yml @@ -3,23 +3,23 @@ info: title: Card Recognition API version: 1.0.0 paths: - /cardinfo: + /cardinthemiddle: get: - summary: Alle Karten Informationen + summary: The Card in the middle responses: '200': - description: Erfolgreiche Anfrage - /card/{id}: + description: success + /cardinmyhand/{playerid}: get: - summary: Ruft Informationen von einer bestimmte Karte + summary: cards in the hand of the player parameters: - in: path - name: id + name: playerid required: true schema: type: integer responses: '200': - description: Erfolgreiche Anfrage + description: success '404': - description: Karte nicht gefunden \ No newline at end of file + description: card not found \ No newline at end of file diff --git a/src/arduino/card_scanner.ino b/src/arduino/card_scanner.ino index 751a92d..e8fbe38 100644 --- a/src/arduino/card_scanner.ino +++ b/src/arduino/card_scanner.ino @@ -1,36 +1,54 @@ -// imports +// imports #include #include +#include +#include + +// Pin Definition +#define SS_PIN 10 +#define RST_PIN 9 + +// Instatiate Motor and RFID Module +Servo motor; +MFRC522 rfid(SS_PIN, RST_PIN); -// Pin Setting -#define RST_PIN1 9 -#define SS_PIN1 10 -#define RST_PIN2 5 -#define SS_PIN2 6 - -#define RST_PIN3 2 -#define SS_PIN3 3 - -// RFID-Module Instances -MFRC522 mfrc522_1(SS_PIN1, RST_PIN1); -MFRC522 mfrc522_2(SS_PIN2, RST_PIN2); -MFRC522 mfrc522_3(SS_PIN3, RST_PIN3); - -// Setup -void setup() { - // Serial Begin +// Setup for first time +void setup() { + // Serial Begin Serial.begin(9600); - // SPI start - SPI.begin(); + // Servo Attach + motor.attach(6); + // Pin Setting + pinMode(2, OUTPUT); + pinMode(3, OUTPUT); - // Initialisation of Modules - mfrc522_1.PCD_Init(); - mfrc522_2.PCD_Init(); - mfrc522_3.PCD_Init(); + // Init SPI bus + SPI.begin(); + // Init MFRC522 + rfid.PCD_Init(); } +// iteration void loop() { - // reading of triple signal + // Reset the loop if no new card present on the sensor/reader. This saves the entire process when idle. + if (!rfid.PICC_IsNewCardPresent()){ + return; + } + // Verify if the NUID has been read + if (!rfid.PICC_ReadCardSerial()){ + return; + } + + Serial.println(rfid.uid) + + + delay(1000); + + // Halt PICC + rfid.PICC_HaltA(); + + // Stop encryption on PCD + rfid.PCD_StopCrypto1(); }