From 7b975bd9a9cb52b8f79419e43b02959bf39c853b Mon Sep 17 00:00:00 2001 From: Clement Date: Thu, 1 Feb 2024 15:38:04 +0100 Subject: [PATCH] add to mutch colis error --- lib/NfcReader/src/BigNfcReader.cpp | 2 +- src/Program.cpp | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/NfcReader/src/BigNfcReader.cpp b/lib/NfcReader/src/BigNfcReader.cpp index 02738bf..abbbf7c 100644 --- a/lib/NfcReader/src/BigNfcReader.cpp +++ b/lib/NfcReader/src/BigNfcReader.cpp @@ -2,7 +2,7 @@ BigNfcReader::BigNfcReader(){ - Serial2.begin(115200,SERIAL_8N1,2,3);//TODO: mettre le port série en paramètre + Serial2.begin(115200, SERIAL_8N1, 16, 17);//TODO: mettre le port série en paramètre this->pair = true; this->trame = new std::vector(); } diff --git a/src/Program.cpp b/src/Program.cpp index b932811..c01be89 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -80,7 +80,8 @@ Program::Program() { this->servo = new ServoMotorComponent(2, 1, 1); this->servo->setDesiredPosition(Position::MIDDLE); this->grbl = new GRBL(STEPMOTOR_I2C_ADDR); - this->outputReader = new BigNfcReader(); + this->outputReader = new BigNfcReader(); + this->outputReader->init(); Wire.begin(21, 22); grbl->init(STEPER_SPEED, STEPER_PAS, STEPER_ACC); struct WifiConfig wifi_c = {WIFI_SSID, WIFI_PASSWORD}; @@ -99,7 +100,12 @@ void Program::loop() { } this->servo->refresh(); this->outputReader->refresh(); - Serial.printf("Output colis number : ", this->outputReader->getNbTags()); + Serial.println(this->outputReader->getNbTags()); + + if(this->outputReader->getNbTags() >= 2){ + lcdScreen->set_nfc_message("To mutch colis number detected"); + return; + } String nfcId = this->nfcReader->ReadNfc(); //si qqc