Merge pull request 'patch' (#22) from develop into master

Reviewed-on: #22

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "new": "cpp"
+    }
+}

config.ini

@@ -14,7 +14,7 @@ build_flags =
     -D MONITOR_SPEED=${config.monitor_speed}
 ; DO NOT TOUCH --- END
     -D WAITING_WIFI_DELAY=1000
-
+    -D TIMEZONE=\"Europe/Paris\"
     ;;;;;;;;;;;;;;;;;;;;;;
     ;;; stepper config ;;;
     ;;;;;;;;;;;;;;;;;;;;;;
@@ -22,14 +22,22 @@ build_flags =
     -D STEPER_ACC=200
     ;-D STEPER_PAS=755.906 ; = 65mm
     -D STEPER_PAS=58 ; = 5mm
-    -D STEPER_SPEED=1000 ; 12000
+    -D STEPER_SPEED=2700 ;1000 ; 2500
-
+    -D GRBL_UPDATE=165 ;update time in ms
-
+    ;;;;;;;;;;;;;;;;;;;;;;
+    ;;;   App config   ;;;
+    ;;;;;;;;;;;;;;;;;;;;;;
+    -D APP_TITLE=\"Warehouse\"
+    -D APP_VERSION=\"1.0\"
     ; nfc addr
     -D NFC_ADDR=0x28
+    ;;;;;;;;;;;;;;;;;;;;;;
+    ;;;  Servo config  ;;;
+    ;;;;;;;;;;;;;;;;;;;;;;
+    -D RIGHT_POS=14 ;18
+    -D MIDDLE_POS=30 ;32
+    -D LEFT_POS=52
 
-    ;;;;;;;;;;;;;;;;;;;;;;
+
-    ;;; BigNfc  config ;;;
+
-    ;;;;;;;;;;;;;;;;;;;;;;
+    -D CONVOYER_LEN=80 ;mm
-    -D BIG_NFC_RX=5
-    -D BIG_NFC_TX=17

config_api.ini

@@ -4,7 +4,8 @@ build_flags =
     -D API_LIST_PRODUCT_URL=\"/products/\"
     -D API_GET_PRODUCT_URL=\"/products/{id}/\"
     -D API_GET_PRODUCT_STOCK_URL=\"/products/{id}/stock/\"
+    -D API_GET_PRODUCT_FACTORY_ID=\"/products\"
     -D API_LIST_WAREHOUSE_URL=\"/warehouses/\"
     -D API_LIST_STOCKS_MOVEMENTS_URL=\"/stockmovements/?sortfield=t.rowid\"
     -D API_CREATE_STOCKS_MOVEMENTS_URL=\"/stockmovements/\"
-    -D API_MAX_JSON_SIZE=4096
+    -D API_MAX_JSON_SIZE=6536

include/Program.h

@@ -1,9 +1,12 @@
 #ifndef PROGRAM_H
 #define PROGRAM_H
 
-#include "Arduino.h"
 #include "DolibarrClient.h"
 #include <M5Stack.h>
+#include "ServoMotorComponent.h"
+#include "NfcReader.h"
+#include "GRBL.h"
+#include "BigNfcReader.h"
 
 class Program {
 public:
@@ -16,8 +19,16 @@ public:
      * Program WarehouseGUI loop
      */
     void loop();
+    void checkNfc();
+    void checkServo();
+    void checkWifi();
 private:
     DolibarrClient *client;
+    ServoMotorComponent *servo;
+    NfcReader *nfcReader;
+    GRBL *grbl;
+    BigNfcReader* outputReader;
+    int grblUpdateTime;
 };
 
 #endif

lib/DolibarrClient/src/DolibarrClient.cpp

@@ -2,6 +2,7 @@
 #include <WiFi.h>
 #include <ArduinoJson.h>
 #include <iostream>
+#include "M5LCD.h"
 
 DolibarrClient::DolibarrClient(struct DolibarrConfig dolibarr_config) : dolibarr(dolibarr_config) {
     #if defined(DEBUG)
@@ -29,9 +30,11 @@ int DolibarrClient::login() const {
     HTTPClient *client = this->build_url(API_LOGIN_URL);
     int httpResponseCode = client->GET();
     if (httpResponseCode > 0) {
-        StaticJsonDocument<API_MAX_JSON_SIZE> doc;
+        DynamicJsonDocument doc(384);
         DeserializationError error = deserializeJson(doc, client->getString().c_str());
         if (error) {
+            Serial.println("ERROR: ");
+            Serial.println(error.c_str());
             delete client;
             return -1;
         }
@@ -56,23 +59,54 @@ std::vector<models::Product> *DolibarrClient::list_products() const {
     return nullptr;
 }
 
-models::Product *DolibarrClient::get_product_by_id(const char* id_product) const {
+models::Product DolibarrClient::get_product_by_factory_id(const char* factory_id) const {
-    HTTPClient *client = this->build_url(replace_id(API_GET_PRODUCT_URL, id_product).c_str());
+    HTTPClient *client = this->build_url(replace_id("/products?sortorder=ASC&limit=1&sqlfilters=(t.accountancy_code_sell:like:'{id}')", factory_id).c_str());
     if (client->GET() == HTTP_CODE_OK) {
-        StaticJsonDocument<API_MAX_JSON_SIZE> doc;
+        DynamicJsonDocument doc(6144);
         DeserializationError error = deserializeJson(doc, client->getString().c_str());
         if (error) {
             Serial.println("ERROR: ");
             Serial.println(error.c_str());
+            delete client;
+            return {};
+        }
+        for (auto obj : doc.as<JsonArray>()) {
+            models::Product product;
+            product.date_creation = obj["date_creation"].as<std::string>();
+            product.id = obj["id"].as<std::string>();
+            product.entity = obj["entity"].as<std::string>();
+            product.stock_reel = obj["stock_reel"].as<std::string>();
+            product.label = obj["label"].as<std::string>();
+            product.accountancy_code_sell = obj["accountancy_code_sell"].as<std::string>();
+            product.accountancy_code_sell_export = obj["accountancy_code_sell_export"].as<std::string>();
+            product.fk_default_warehouse = obj["fk_default_warehouse"].as<std::string>();
+            delete client;
+            return product;
+        }
+        delete client;
+        return {};
+    }
+    delete client;
+    return {};
+}
+
+models::Product *DolibarrClient::get_product_by_id(const char* id_product) const {
+    HTTPClient *client = this->build_url(replace_id(API_GET_PRODUCT_URL, id_product).c_str());
+    if (client->GET() == HTTP_CODE_OK) {
+        DynamicJsonDocument doc(6144);
+        DeserializationError error = deserializeJson(doc, client->getString().c_str());
+        if (error) {
             delete client;
             return nullptr;
         }
         auto *product = new models::Product();
-        product->date_creation = doc["date_creation"];
+        product->date_creation = doc["date_creation"].as<std::string>();
-        product->id = doc["id"];
+        product->id = doc["id"].as<std::string>();
-        product->entity = doc["entity"];
+        product->entity = doc["entity"].as<std::string>();
-        product->stock_reel = doc["stock_reel"];
+        product->stock_reel = doc["stock_reel"].as<std::string>();
-        product->label = doc["label"];
+        product->label = doc["label"].as<std::string>();
+        product->accountancy_code_sell = doc["accountancy_code_sell"].as<std::string>();
+        product->accountancy_code_sell_export = doc["accountancy_code_sell_export"].as<std::string>();
         delete client;
         return product;
     }
@@ -83,7 +117,7 @@ models::Product *DolibarrClient::get_product_by_id(const char* id_product) const
 std::vector<models::Warehouse> *DolibarrClient::list_warehouse() const {
     HTTPClient *client = this->build_url(API_LIST_WAREHOUSE_URL);
     if (client->GET() == HTTP_CODE_OK) {
-        StaticJsonDocument<API_MAX_JSON_SIZE> doc;
+        DynamicJsonDocument doc(8192);
         DeserializationError error = deserializeJson(doc, client->getString().c_str());
         if (error) {
             Serial.println("ERROR: ");
@@ -94,7 +128,8 @@ std::vector<models::Warehouse> *DolibarrClient::list_warehouse() const {
         auto *warehouses = new std::vector<models::Warehouse>();
         for (auto obj : doc.as<JsonArray>()) {
             models::Warehouse warehouse = {};
-            warehouse.id = obj["id"];
+            warehouse.id = obj["id"].as<std::string>();
+            warehouse.label = obj["label"].as<std::string>();
             warehouses->push_back(warehouse);
         }
         delete client;
@@ -104,13 +139,15 @@ std::vector<models::Warehouse> *DolibarrClient::list_warehouse() const {
     return nullptr;
 }
 
-int DolibarrClient::create_movement(models::CreateProductStock &stock) const {
+int DolibarrClient::create_movement(models::CreateProductStock stock) const {
-    HTTPClient *client = this->build_url("API_CREATE_STOCKS_MOVEMENTS_URL");
+    HTTPClient *client = this->build_url(API_CREATE_STOCKS_MOVEMENTS_URL);
-    StaticJsonDocument<API_MAX_JSON_SIZE> doc;
+    DynamicJsonDocument doc(4096);
     std::string result;
     doc["product_id"] = stock.product_id;
     doc["warehouse_id"]  = stock.warehouse_id;
     doc["qty"] = stock.qty;
+    doc["movementlabel"] = "T-IOT - Warehouse GUI";
+    doc["movementcode"] = "M" + stock.product_id + "-W" + stock.warehouse_id;
     serializeJson(doc, result);
     Serial.println(result.c_str());
     if (client->POST(result.c_str()) == HTTP_CODE_OK) {
@@ -122,30 +159,5 @@ int DolibarrClient::create_movement(models::CreateProductStock &stock) const {
 
 int DolibarrClient::initialize_http_client() {
     this->httpClient = new HTTPClient();
-    if (this->login() == 0) {
-        auto* product = this->get_product_by_id("1");
-        if (product == nullptr) {
-            Serial.println("Product is nullptr !");
-            return -1;
-        }
-        Serial.println("Product label: ");
-        Serial.println(product->label);
-        auto* warehouses = this->list_warehouse();
-        if (warehouses == nullptr) {
-            delete product;
-            Serial.println("Warehouse is nullptr !");
-            return -1;
-        }
-        Serial.println("Warehouses: ");
-        models::CreateProductStock product_stock = {product->id, warehouses->at(0).id, "1"};
-        this->create_movement(product_stock);
-        for (auto warehouse : *warehouses) {
-            Serial.println(warehouse.id);
-        }
-        delete product;
-        delete warehouses;
-    } else {
-        Serial.println("An Error has occurred while trying to login");
-    }
     return 0;
 }

lib/DolibarrClient/src/DolibarrClient.h

@@ -24,7 +24,8 @@ public:
     std::vector<models::Warehouse> *list_warehouse() const;
     std::vector<models::Product> *list_products() const;
     models::Product *get_product_by_id(const char* id_product) const;
-    int create_movement(models::CreateProductStock &stock) const;
+    models::Product get_product_by_factory_id(const char* uuid) const;
+    int create_movement(models::CreateProductStock stock) const;
 private:
     HTTPClient* httpClient{};
     struct DolibarrConfig dolibarr;

lib/DolibarrClient/src/DolibarrModels.h

@@ -4,35 +4,39 @@
 namespace models {
 
     struct Product {
-        const char* id;
+        std::string id;
-        const char* entity;
+        std::string entity;
-        const char* ref;
+        std::string ref;
-        const char* status;
+        std::string status;
-        const char* date_creation;
+        std::string date_creation;
-        const char* date_modification;
+        std::string date_modification;
-        const char* label;
+        std::string label;
-        const char* description;
+        std::string description;
-        const char* type;
+        std::string type;
-        const char* price;
+        std::string accountancy_code_sell;
-        const char* stock_reel;
+        std::string accountancy_code_sell_export;
-        const char* seuil_stock_alerte;
+        std::string fk_default_warehouse;
-        const char* desiredstock;
+        std::string price;
+        std::string stock_reel;
+        std::string seuil_stock_alerte;
+        std::string desiredstock;
     };
 
     struct ProductStock {
-        const char* id;
+        std::string id;
-        const char* product_id;
+        std::string product_id;
-        const char* quantity;
+        std::string quantity;
     };
 
     struct CreateProductStock {
-        const char* product_id;
+        std::string product_id;
-        const char* warehouse_id;
+        std::string warehouse_id;
-        const char* qty;
+        std::string qty;
     };
 
     struct Warehouse {
-        const char* id;
+        std::string id;
+        std::string label;
     };
 
 }

lib/GRBL/include/GRBL.h

@@ -8,6 +8,7 @@ class iGRBL{
 public:
     virtual void init(int speed, double pas, int accel, String mode = "distance") = 0;
     virtual void mouveForward(int mm) = 0;
+    virtual bool isIddle() = 0;
 };
 
 class GRBL : public iGRBL{
@@ -15,6 +16,7 @@ public:
     GRBL(int grblAddr);
     void init(int speed, double pas, int accel, String mode = "distance") override;
     void mouveForward(int mm = 5) override;
+    bool isIddle() override;
 private:
     Module_GRBL* grbl;
 };

lib/GRBL/src/GRBL.cpp

@@ -32,3 +32,13 @@ void GRBL::mouveForward(int mm){
     sprintf(s, "G1 X%d", mm);
     this->grbl->sendGcode(s);
 }
+
+bool GRBL::isIddle(){
+    bool sortie = false;
+
+    if(this->grbl->readStatus().indexOf("IDLE") != -1){
+        sortie = true;
+    }
+
+    return sortie;
+}

lib/M5LCD/src/M5LCD.cpp

@@ -0,0 +1,224 @@
+#include "M5LCD.h"
+
+/*
+ * M5LCD classe
+ */
+
+M5LCD::M5LCD() : _current_page(0), _logs() , _debug_loc_y(0), _components_status({COMPONENT_KO, COMPONENT_KO, COMPONENT_KO, COMPONENT_KO, COMPONENT_KO}) {
+    this->_product_id = std::string("");
+    this->_product_label = std::string("");
+    this->_last_nfc = std::string("");
+    this->_servo_current_position = std::string("");
+    this->_dolibarr_msg = std::string("");
+    M5.begin();
+    M5.Power.begin();
+    M5.lcd.setBrightness(100);
+    this->update_page();
+}
+
+void M5LCD::update() {
+    M5.update();
+    if (M5.BtnB.wasReleased() != 0) {
+        this->_current_page = (this->_current_page + 1) % LCD_PAGES;
+        this->update_page();
+    }
+    if (this->_current_page == DEBUG_SCREEN && M5.BtnA.wasReleased() != 0 && this->_debug_loc_y < 0) {
+        this->_debug_loc_y++;
+        this->update_page();
+    }
+    if (this->_current_page == DEBUG_SCREEN && M5.BtnC.wasReleased() != 0) {
+        this->_debug_loc_y--;
+        this->update_page();
+    }
+}
+
+void M5LCD::update_page() const {
+    M5.Lcd.clear();
+    switch (this->_current_page) {
+        case 0:
+            this->show_dashboard();
+            break;
+        case 1:
+            this->show_debug();
+            break;
+        case 2:
+            this->show_config();
+            break;
+    }
+    this->update_pagination();
+}
+
+void M5LCD::display_error(const char *str) const {
+    M5.Lcd.setTextColor(WHITE, RED);
+    M5.Lcd.setTextSize(1);
+    M5.Lcd.setCursor(0, 40);
+    M5.Lcd.println(str);
+}
+
+void M5LCD::display_message(const char *str) const {
+}
+
+void M5LCD::display_warning(const char *str) const {
+}
+
+std::string get_status(AvailableComponentsStatus status) {
+    return status == COMPONENT_OK ? "OK" : "KO";
+}
+
+void draw_component_stats(int x, int y, int fx, int fy, int fw, int fh,  const char *name, AvailableComponentsStatus status) {
+    M5.Lcd.setTextSize(2);
+    if (status == COMPONENT_OK) {
+        M5.Lcd.setTextColor(WHITE, GREEN);
+    } else {
+        M5.Lcd.setTextColor(WHITE, RED);
+    }
+    if (status == COMPONENT_OK) {
+        M5.Lcd.fillRect(fx, fy, fw, fh, GREEN);
+    } else {
+        M5.Lcd.fillRect(fx, fy, fw, fh, RED);
+    }
+    M5.Lcd.setCursor(x, y);
+    M5.Lcd.printf("%s %s", name, get_status(status).c_str());
+}
+
+void M5LCD::show_dashboard() const {
+    draw_component_stats(10, 18, 0, 0, 100, 50, "NFC", _components_status.nfc);
+    draw_component_stats(150, 18, 110, 0, 210, 50, "DOLIBARR", _components_status.dolibarr);
+    draw_component_stats(8, 78, 0, 60, 100, 50, "WIFI", _components_status.wifi);
+    draw_component_stats(112, 78, 110, 60, 100, 50, "SERVO", _components_status.servo);
+    draw_component_stats(230, 78, 220, 60, 100, 50, "GRBL", _components_status.grbl);
+
+    M5.Lcd.drawRect(0, 120, 320, 100, BLUE);
+    M5.Lcd.setTextColor(WHITE, BLACK);
+    M5.Lcd.setTextSize(2);
+    if (!this->_last_nfc.empty()) {
+        M5.Lcd.setCursor(10, 130);
+        M5.Lcd.printf("NFC: %s", this->_last_nfc.c_str());
+    }
+    if (!this->_product_id.empty() && !this->_product_label.empty()) {
+        M5.Lcd.setCursor(10, 150);
+        M5.Lcd.printf("Produit: %s - %s", this->_product_label.c_str(), this->_product_id.c_str());
+    }
+    if (!this->_dolibarr_msg.empty()) {
+        M5.Lcd.setCursor(10, 170);
+        M5.Lcd.printf("Produit: %s", this->_last_nfc.c_str());
+    }
+    if (!this->_servo_current_position.empty()) {
+        M5.Lcd.setCursor(10, 190);
+        M5.Lcd.printf("SERVO Posistion: %s", this->_servo_current_position.c_str());
+    }
+
+    M5.Lcd.setTextSize(1);
+    M5.Lcd.setCursor(0, 230);
+    M5.Lcd.printf("%s - %s", APP_TITLE, APP_VERSION);
+}
+
+void M5LCD::show_debug() const {
+    M5.Lcd.setTextColor(WHITE, BLACK);
+    M5.Lcd.setTextSize(1);
+    int i = 0;
+    for (auto val : this->_logs) {
+        M5.Lcd.setCursor(0, i + (this->_debug_loc_y * 10));
+        M5.Lcd.printf("[%s] - %s", val.get_datetime_format(), val.get_message().c_str());
+        i+=10;
+    }
+}
+
+void M5LCD::update_pagination() const {
+    M5.Lcd.setTextSize(1);
+    M5.Lcd.setTextColor(WHITE, BLACK);
+    M5.Lcd.setCursor(302, 230);
+    M5.Lcd.printf("%d/%d", this->_current_page+1, LCD_PAGES);
+}
+
+void M5LCD::add_log(const char* str) {
+    this->_logs.emplace_back(str);
+    if (this->_current_page == DEBUG_SCREEN) {
+        this->show_debug();
+    }
+}
+
+void M5LCD::show_config() const {
+
+}
+
+ComponentsStatus M5LCD::get_components() {
+    return this->_components_status;
+}
+
+void M5LCD::set_wifi_status(AvailableComponentsStatus status) {
+    this->_components_status.wifi = status;
+    this->update_dashboard();
+}
+
+void M5LCD::set_nfc_status(AvailableComponentsStatus status) {
+    this->_components_status.nfc = status;
+    this->update_dashboard();
+}
+
+void M5LCD::set_grbl_status(AvailableComponentsStatus status) {
+    this->_components_status.grbl = status;
+    this->update_dashboard();
+}
+
+void M5LCD::set_servo(AvailableComponentsStatus status) {
+    this->_components_status.servo = status;
+    this->update_dashboard();
+}
+
+void M5LCD::set_dolibarr_status(AvailableComponentsStatus status) {
+    this->_components_status.dolibarr = status;
+    this->update_dashboard();
+}
+
+void M5LCD::update_dashboard() const {
+    if (this->_current_page == DASHBOARD_SCREEN) {
+        this->show_dashboard();
+    }
+}
+
+
+void M5LCD::set_dolibarr_message(std::string str) {
+    this->_dolibarr_msg = str;
+    this->update_dashboard();
+}
+
+void M5LCD::set_nfc_message(std::string str) {
+    this->_last_nfc = str;
+    this->update_dashboard();
+}
+
+void M5LCD::set_product_id(std::string str) {
+    this->_product_id = str;
+    this->update_dashboard();
+}
+
+void M5LCD::set_servo_message(std::string str) {
+    this->_servo_current_position = str;
+    this->update_dashboard();
+}
+
+void M5LCD::set_product_label(std::string str) {
+    this->_product_label = str;
+    this->update_dashboard();
+
+}
+
+/*
+ * LogMessage classe
+ */
+
+LogMessage::LogMessage(std::string log) {
+    this->log = log;
+    this->datetime = time(nullptr);
+}
+
+std::string LogMessage::get_message() const {
+    return this->log;
+}
+
+const char *LogMessage::get_datetime_format() const {
+    void *buff = malloc(20 * sizeof(char));
+    strftime((char*) buff, 20, "%H:%M:%S", localtime(&this->datetime));
+    return (char*) buff;
+}

lib/M5LCD/src/M5LCD.h

@@ -0,0 +1,84 @@
+#ifndef T_IOT_901_CONVOYOR_M5LCD_H
+#define T_IOT_901_CONVOYOR_M5LCD_H
+
+#include <vector>
+#include <ctime>
+#include "M5Stack.h"
+
+#define LCD_PAGES 3
+#define DASHBOARD_SCREEN 0
+#define DEBUG_SCREEN 1
+#define CONFIG_SCREEN 2
+
+enum AvailableComponentsStatus {
+    COMPONENT_OK,
+    COMPONENT_KO,
+    COMPONENT_MISSING,
+    UNKNOWN_ERROR,
+};
+
+typedef struct ComponentsStatus {
+    AvailableComponentsStatus nfc;
+    AvailableComponentsStatus wifi;
+    AvailableComponentsStatus dolibarr;
+    AvailableComponentsStatus servo;
+    AvailableComponentsStatus grbl;
+} ComponentsStatus;
+
+typedef struct MessageToShow {
+    const char* message;
+    int color;
+} MessageToShow;
+
+class LogMessage {
+public:
+    LogMessage(std::string log);
+    std::string get_message() const;
+    const char* get_datetime_format() const;
+private:
+    time_t datetime;
+    std::string log;
+};
+
+class M5LCD {
+public:
+    M5LCD();
+    void display_message(const char* str) const;
+    void display_error(const char* str) const;
+    void display_warning(const char* str) const;
+    void add_log(const char *str);
+    void update();
+    ComponentsStatus get_components();
+    void set_wifi_status(AvailableComponentsStatus status);
+    void set_nfc_status(AvailableComponentsStatus status);
+    void set_grbl_status(AvailableComponentsStatus status);
+    void set_servo(AvailableComponentsStatus status);
+    void set_dolibarr_status(AvailableComponentsStatus status);
+
+    void set_nfc_message(std::string str);
+    void set_dolibarr_message(std::string str);
+    void set_product_label(std::string str);
+    void set_product_id(std::string str);
+    void set_servo_message(std::string str);
+    int _current_page;
+private:
+    void update_page() const;
+    void show_debug() const;
+    void show_dashboard() const;
+    void show_config() const;
+    void update_pagination() const;
+    void update_dashboard() const;
+
+    int _debug_loc_y;
+    std::vector<LogMessage> _logs;
+    ComponentsStatus _components_status;
+    std::string _last_nfc;
+    std::string _product_label;
+    std::string _product_id;
+    std::string _dolibarr_msg;
+    std::string _servo_current_position;
+};
+
+inline M5LCD *lcdScreen;
+
+#endif //T_IOT_901_CONVOYOR_M5LCD_H

lib/NFC/src/NfcReader.cpp

@@ -11,7 +11,7 @@ String NfcReader::ReadNfc()
     this->uid.clear();
     if (!this->mfrc522->PICC_IsNewCardPresent() ||
         !this->mfrc522->PICC_ReadCardSerial()) {
-        return ("0");
+        return "0";
     }
     for (unsigned int i = 0; i < this->mfrc522->uid.size; i++) {
         if (this->mfrc522->uid.uidByte[i] < 0xF) {
@@ -23,3 +23,10 @@ String NfcReader::ReadNfc()
     }
     return (this->uid);
 }
+
+bool NfcReader::IsNfcConnected()
+{
+    Wire.beginTransmission(NFC_ADDR);
+    byte error = Wire.endTransmission();
+    return error == 0;
+}

lib/NFC/src/NfcReader.h

@@ -1,5 +1,5 @@
-#ifndef NFCREADER_HPP_
+#ifndef NFCREADER_H
-#define NFCREADER_HPP_
+#define NFCREADER_H
 
 #include <M5Stack.h>
 #include "MFRC522_I2C.h"
@@ -9,6 +9,7 @@ class NfcReader {
     public:
         NfcReader(int i2c_adress);
         ~NfcReader() = default;
+        bool IsNfcConnected();
 
         String ReadNfc();
 
@@ -18,4 +19,4 @@ class NfcReader {
         String uid;
 };
 
-#endif /* !NFCREADER_HPP_ */
+#endif /* !NFCREADER_H */

lib/NfcReader/include/BigNfcReader.h

@@ -1,13 +1,14 @@
-#ifndef BIG_NFC_H
+#ifndef BIG_NFC_READER_H
-#define BIG_NFC_H
+#define BIG_NFC_READER_H
 
 #include <Arduino.h>
 #include <vector>
+
 #include "TrameList.h"
 
-class BigNFC{
+class BigNfcReader{
 public:
-    BigNFC(int pinRX, int pinTX, int baud = 115200);
+    BigNfcReader();
 
     /**
      * @brief initialise le lecteur NFC
@@ -60,4 +61,7 @@ private:
 
 };
 
+
+
+
 #endif

lib/NfcReader/src/BigNfcReader.cpp

@@ -1,13 +1,14 @@
-#include "../include/BigNFC.h"
+#include "../include/BigNfcReader.h"
 
 
-BigNFC::BigNFC(int pinRX, int pinTX, int baud){
+BigNfcReader::BigNfcReader(){
-    Serial2.begin(baud, SERIAL_8N1, pinRX, pinTX);//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>();
 }
 
-bool BigNFC::init(){
+
+bool BigNfcReader::init(){
     const std::vector<std::vector<byte>> INIT_TRAMES = {INIT_TRAM_0, INIT_TRAM_1, INIT_TRAM_2, INIT_TRAM_3, INIT_TRAM_4, INIT_TRAM_5, INIT_TRAM_6, INIT_TRAM_7};
     const std::vector<std::vector<byte>> REP_TRAMES = {REP_TRAM_0, REP_TRAM_1, REP_TRAM_2, REP_TRAM_3, REP_TRAM_4, REP_TRAM_5, REP_TRAM_6, REP_TRAM_7};
     int repnb = 0;
@@ -29,7 +30,7 @@ bool BigNFC::init(){
     return true;
 }
 
-void BigNFC::refresh(){
+void BigNfcReader::refresh(){
     this->trame->clear();
     std::vector<byte> trame = READ_TRAM_0;
     if (this->pair){
@@ -46,7 +47,8 @@ void BigNFC::refresh(){
     }
 }
 
-String BigNFC::digitify(int number){
+
+String BigNfcReader::digitify(int number){
     String sortie = "";
 
     if(number <= 0xF){
@@ -60,7 +62,7 @@ String BigNFC::digitify(int number){
 }
 
 
-void BigNFC::printTrame(){
+void BigNfcReader::printTrame(){
     for(byte i: *this->trame){
         Serial.print(this->digitify(i));
         Serial.print(" ");
@@ -68,6 +70,6 @@ void BigNFC::printTrame(){
     Serial.println();
 }
 
-int BigNFC::getNbTags(){
+int BigNfcReader::getNbTags(){
     return this->trame->at(8);
 }

lib/ServoMotorComponent/src/ServoMotorComponent.cpp

@@ -0,0 +1,63 @@
+#include "ServoMotorComponent.h"
+
+
+/////////////////////////////////////////////////////////////////////////////////////
+// Functions for setting up the ServoMotor
+/////////////////////////////////////////////////////////////////////////////////////
+
+/**
+ * Constructor.
+ * Prepares the ServoMotor.
+ */
+ServoMotorComponent::ServoMotorComponent(int PIN,  unsigned long updatePeriod, float step) {
+    this->PIN = PIN;
+    this->myservo.attach(PIN);
+    this->desiredposition = Position::MIDDLE;
+    this->currentPosition = MIDDLE_POS;
+    this->lastUpTime = millis();
+    this->updatePeriod = updatePeriod;
+    this->step = step;
+    this->myservo.write(this->PIN, this->currentPosition);
+}
+
+/**
+ * Set the desired position
+ * @desiredPosition: Give desired position
+ */
+void ServoMotorComponent::setDesiredPosition(Position desiredPosition) {
+    switch (desiredPosition) {
+        case Position::LEFT:
+            this->desiredposition = LEFT_POS;
+            break;
+        case Position::MIDDLE:
+            this->desiredposition = MIDDLE_POS;
+            break;
+        case Position::RIGHT:
+            this->desiredposition = RIGHT_POS;
+            break;
+        default:
+            break;
+    }
+}
+
+
+/**
+ * Write a new servoMotor position when it's necessary
+ */
+void ServoMotorComponent::refresh() {
+    if (this->desiredposition == this->currentPosition 
+    ||  millis() - this->lastUpTime <= this->updatePeriod) return;
+
+    if (this->currentPosition > this->desiredposition) {
+        this->currentPosition -= this->step;
+    }
+    if (this->currentPosition < this->desiredposition) {
+        this->currentPosition += this->step;
+    }
+    this->lastUpTime = millis();
+    this->myservo.write(this->PIN, this->currentPosition);
+}
+
+bool ServoMotorComponent::isConnected() {
+    return true;
+}

lib/ServoMotorComponent/src/ServoMotorComponent.h

@@ -0,0 +1,34 @@
+#ifndef SERVOMOTOT_COMPONENT_H
+#define SERVOMOTOT_COMPONENT_H
+
+#include <Servo.h>
+
+enum Position {
+    LEFT,
+    MIDDLE,
+    RIGHT
+};
+
+class ServoMotorComponent
+{
+public:
+    ServoMotorComponent(int PIN, unsigned long updatePeriod = 100, float step = 0.1);
+    void setDesiredPosition(Position desiredPosition);
+    bool isConnected();
+    void refresh();
+
+private:
+    int PIN;
+    float currentPosition;
+    float desiredposition;
+    Servo myservo;
+    unsigned long lastUpTime;
+    unsigned long updatePeriod;
+    float step;
+};
+
+
+
+
+
+#endif //SERVOMOTOT_COMPONENT_H

lib/WorldTime/src/WorldTime.cpp

@@ -0,0 +1 @@
+#include "WorldTime.h"

lib/WorldTime/src/WorldTime.h

@@ -0,0 +1,6 @@
+#ifndef T_IOT_901_CONVOYOR_WORLDTIME_H
+#define T_IOT_901_CONVOYOR_WORLDTIME_H
+
+
+
+#endif //T_IOT_901_CONVOYOR_WORLDTIME_H

platformio.ini

@@ -55,6 +55,7 @@ lib_deps =
     m5stack/M5Stack@^0.4.5 ; M5 Lib
     m5stack/M5GFX@^0.1.9 ; M5 Lib pour le LCD
     m5stack/Module_GRBL_13.2@^0.0.3 ; M5 Lib pour Stepper (GRBL)
+    dlloydev/ESP32 ESP32S2 AnalogWrite ; Lib pour le Servo Motor
 ;    example:
 ;    erropix/ESP32 AnalogWrite@0.2
 

src/Program.cpp

@@ -1,29 +1,175 @@
 #include "Program.h"
 #include "Arduino.h"
+#include "M5LCD.h"
 #include "DolibarrClient.h"
+#include "ServoMotorComponent.h"
+#include "NfcReader.h"
+#include <Ticker.h>
+
+uint32_t derniereExecution = 0;
+const uint32_t intervalle = 1000;
+std::vector<models::Warehouse> *warehouses;
 
 int initialize_wifi(WifiConfig wifi) {
+    lcdScreen->add_log("Connecting to the WiFi network...");
     WiFiClass::mode(WIFI_STA); //Optional
     WiFi.setSleep(false);
     WiFi.begin(wifi.ssid, wifi.password);
-    Serial.print("Connecting ");
-    while(WiFiClass::status() != WL_CONNECTED){
-        delay(WAITING_WIFI_DELAY);
-        Serial.print(".");
-    }
-    Serial.println("Connected to the WiFi network");
     return 0;
 }
 
+void Program::checkNfc() {
+    if (this->nfcReader->IsNfcConnected() && lcdScreen->get_components().nfc != COMPONENT_OK) {
+        lcdScreen->set_nfc_status(COMPONENT_OK);
+        lcdScreen->add_log("NFC component connected !");
+        Serial.println("NFC IS CONNECTED !");
+    } else if (!this->nfcReader->IsNfcConnected() && lcdScreen->get_components().nfc == COMPONENT_OK) {
+        lcdScreen->set_nfc_status(COMPONENT_KO);
+        lcdScreen->add_log("NFC component disconnected !");
+        Serial.println("NFC NOT CONNECTED !");
+    }
+}
+
+void Program::checkServo() {
+    if (this->servo->isConnected() && lcdScreen->get_components().servo != COMPONENT_OK) {
+        lcdScreen->set_servo(COMPONENT_OK);
+        lcdScreen->add_log("SERVO component connected !");
+        Serial.println("SERVO IS CONNECTED !");
+    } else if (!this->servo->isConnected() && lcdScreen->get_components().servo == COMPONENT_OK) {
+        lcdScreen->set_servo(COMPONENT_KO);
+        lcdScreen->add_log("SERVO component disconnected !");
+        Serial.println("SERVO NOT CONNECTED !");
+    }
+}
+
+void Program::checkWifi() {
+    if (WiFiClass::status() == WL_CONNECTED && lcdScreen->get_components().wifi != COMPONENT_OK) {
+        lcdScreen->add_log("Connected to the WiFi network");
+        lcdScreen->set_wifi_status(COMPONENT_OK);
+        struct DolibarrConfig dolibarr = {DOLIBARR_URL, DOLIBARR_API_TOKEN};
+        this->client = new DolibarrClient(dolibarr);
+        warehouses = this->client->list_warehouse();
+        if (warehouses != nullptr) {
+            lcdScreen->add_log("Warehouses found !");
+            lcdScreen->set_dolibarr_status(COMPONENT_OK);
+            for (auto &ware : *warehouses) {
+                char buffer[50];
+                sprintf(buffer, "+ Warehouse '%s' (%s)", ware.label.c_str(), ware.id.c_str());
+                lcdScreen->add_log(buffer);
+            }
+        } else {
+            lcdScreen->add_log("Warehouse not found");
+            lcdScreen->set_dolibarr_status(COMPONENT_KO);
+        }
+    } else if (WiFiClass::status() != WL_CONNECTED && lcdScreen->get_components().wifi == COMPONENT_OK) {
+        lcdScreen->add_log("Wifi signal lost, reconnecting...");
+        lcdScreen->set_wifi_status(COMPONENT_KO);
+        lcdScreen->set_dolibarr_status(COMPONENT_KO);
+        struct WifiConfig wifi_c = {WIFI_SSID, WIFI_PASSWORD};
+        initialize_wifi(wifi_c);
+    }
+}
+
 Program::Program() {
     Serial.begin(MONITOR_SPEED);
+    Wire.begin();
+    delay(1000);
+    lcdScreen = new M5LCD();
+    lcdScreen->add_log("Initialize M5LCD component....");
+    this->nfcReader = new NfcReader(NFC_ADDR);
+    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->init();
+    this->grblUpdateTime = 0;
+    lcdScreen->set_grbl_status(COMPONENT_OK);
+    Wire.begin(21, 22);
+    grbl->init(STEPER_SPEED, STEPER_PAS, STEPER_ACC);
     struct WifiConfig wifi_c = {WIFI_SSID, WIFI_PASSWORD};
-    struct DolibarrConfig dolibarr = {DOLIBARR_URL, DOLIBARR_API_TOKEN};
     initialize_wifi(wifi_c);
-    this->client = new DolibarrClient(dolibarr);
 }
 
 void Program::loop() {
+    lcdScreen->update();
+
+    uint32_t maintenant = millis();
+    if (maintenant - derniereExecution >= intervalle) {
+        this->checkServo();
+        this->checkNfc();
+        this->checkWifi();
+        derniereExecution = maintenant;
+    }
+    this->servo->refresh();
+    this->outputReader->refresh();
+    // Serial.println(this->outputReader->getNbTags());
+
+    if(this->outputReader->getNbTags() >= 2){
+        lcdScreen->set_nfc_message("To mutch colis number detected");
+        lcdScreen->set_grbl_status(COMPONENT_KO);
+    }
+
+    String nfcId = this->nfcReader->ReadNfc();
+    //si qqc
+    if(nfcId != "0"){
+        if (lcdScreen->get_components().wifi != COMPONENT_OK) {
+            lcdScreen->add_log("Wifi not connected !");
+            lcdScreen->set_nfc_message("Cannot send wifi request !");
+            return;
+        }
+        //j'arrète le stepper
+        //this->grbl->stop(); //FIXME: implemente
+        //j'affiche le tag lue
+        Serial.print("new colis in comming : ");
+        lcdScreen->add_log("new colis detected: ");
+        lcdScreen->add_log(nfcId.c_str());
+        lcdScreen->set_nfc_message(nfcId.c_str());
+        auto product = this->client->get_product_by_factory_id(nfcId.c_str());
+        Serial.printf("Product: %s\n%s", product.label.c_str(), product.accountancy_code_sell_export.c_str());
+        lcdScreen->set_product_label(product.label);
+        lcdScreen->set_product_id(product.id);
+        /*if (product.fk_default_warehouse == product.accountancy_code_sell_export) {
+            Serial.printf("Product already in the good warehouse !\n");
+            return;
+        }*/
+        auto ware = std::find_if(warehouses->begin(), warehouses->end(), [&product](models::Warehouse w) {return w.id == product.accountancy_code_sell_export;});
+        if (ware.base() == nullptr) {
+            Serial.printf("Warehouse not found !\n");
+            return;
+        }
+        Serial.printf("Product need to go to warehouse %s\n", ware->label.c_str());
+        this->client->create_movement(models::CreateProductStock{
+                    product.id,
+                    product.fk_default_warehouse,
+                    "-1"
+        });
+        if (this->client->create_movement(models::CreateProductStock{
+                product.id,
+                ware->id,
+                "1"
+            }) == 0) {
+            Serial.printf("Movement created !\n");
+        } else {
+            Serial.printf("Movement cannot be created !\n");
+        }
+        if (ware->id == "1") {
+            this->servo->setDesiredPosition(Position::RIGHT);
+            lcdScreen->set_servo_message("RIGHT");
+        } else if (ware->id == "2") {
+            this->servo->setDesiredPosition(Position::LEFT);
+            lcdScreen->set_servo_message("LEFT");
+        } else if (ware->id == "3") {
+            this->servo->setDesiredPosition(Position::MIDDLE);
+            lcdScreen->set_servo_message("MIDDLE");
+        }
+        this->grbl->mouveForward(CONVOYER_LEN);
+    } else {
+        if((this->grbl->isIddle() || (maintenant - this->grblUpdateTime >= GRBL_UPDATE)) && lcdScreen->get_components().grbl == COMPONENT_OK){
+            this->grblUpdateTime = maintenant;
+            this->grbl->mouveForward(5);
+        }
+    }
+    if(M5.BtnC.wasReleased() != 0 && lcdScreen->_current_page == DASHBOARD_SCREEN){
+        lcdScreen->set_grbl_status(COMPONENT_OK);
+    }
 }
-
-