Epitech/T-IOT-901_convoyor
4
0
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

feat:V1.0 #8

Merged
Clement merged 58 commits from develop into master 2024-02-02 16:03:25 +00:00
Conversation 0 Commits 58 Files Changed 35 +9 -3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7b975bd9a9 - Show all commits

2
lib/NfcReader/src/BigNfcReader.cpp
View File

@ -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<byte>();
}

10
src/Program.cpp
View File

@ -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