Merge branch 'develop' of ssh://git.lab-ouest.org:8022/Epitech/T-IOT-901_convoyor into feat/main-algo

# Conflicts:
#	config.ini
#	include/Program.h
#	lib/NFC/src/NfcReader.cpp
#	src/Program.cpp

include/Program.h

@@ -2,11 +2,10 @@
 #define PROGRAM_H
 
 #include "DolibarrClient.h"
-#include "GRBL.h"
-#include "NfcReader.h"
-#include <Arduino.h>
 #include <M5Stack.h>
-// #include <vector>
+#include "ServoMotorComponent.h"
+#include "NfcReader.h"
+#include "GRBL.h"
 
 class Program {
 public:
@@ -19,21 +18,14 @@ public:
      * Program WarehouseGUI loop
      */
     void loop();
-
+    void checkNfc();
+    void checkServo();
+    void checkWifi();
 private:
-
     DolibarrClient *client;
-
-    /**
-     * @brief stepper motor controller
-     */
-    GRBL* grbl;
-
-    /**
-     * @brief nfc reader
-     *
-     */
-    NfcReader* NFC;
+    ServoMotorComponent *servo;
+    NfcReader *nfcReader;
+    GRBL *grbl;
 };
 
 #endif