From 4f3a5bda0351a46c5c1dc10578fe43358a3c615c Mon Sep 17 00:00:00 2001 From: Nicolas SANS Date: Fri, 19 Jan 2024 16:40:28 +0100 Subject: [PATCH] =?UTF-8?q?Cr=C3=A9ation=20du=20composant=20LCD,=20rajout?= =?UTF-8?q?=20des=20=C3=A9crans=20de=20logs=20et=20du=20dashboard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.ini | 2 + config_api.ini | 2 +- lib/DolibarrClient/src/DolibarrClient.cpp | 45 ++---- lib/DolibarrClient/src/DolibarrModels.h | 9 +- lib/M5LCD/src/M5LCD.cpp | 186 ++++++++++++++++++++++ lib/M5LCD/src/M5LCD.h | 73 +++++++++ src/Program.cpp | 39 ++++- 7 files changed, 310 insertions(+), 46 deletions(-) create mode 100644 lib/M5LCD/src/M5LCD.cpp create mode 100644 lib/M5LCD/src/M5LCD.h diff --git a/config.ini b/config.ini index 21dd53e..69d6874 100644 --- a/config.ini +++ b/config.ini @@ -23,3 +23,5 @@ build_flags = ;-D STEPER_PAS=755.906 ; = 65mm -D STEPER_PAS=58 ; = 5mm -D STEPER_SPEED=1000 ; 12000 + -D APP_TITLE=\"Warehouse\" + -D APP_VERSION=\"1.0\" diff --git a/config_api.ini b/config_api.ini index 985e209..e2bd551 100644 --- a/config_api.ini +++ b/config_api.ini @@ -7,4 +7,4 @@ build_flags = -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 diff --git a/lib/DolibarrClient/src/DolibarrClient.cpp b/lib/DolibarrClient/src/DolibarrClient.cpp index a07353d..1a29be1 100644 --- a/lib/DolibarrClient/src/DolibarrClient.cpp +++ b/lib/DolibarrClient/src/DolibarrClient.cpp @@ -2,6 +2,7 @@ #include #include #include +#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 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; } @@ -59,11 +62,11 @@ std::vector *DolibarrClient::list_products() const { 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) { - StaticJsonDocument doc; + DynamicJsonDocument doc(6144); DeserializationError error = deserializeJson(doc, client->getString().c_str()); if (error) { - Serial.println("ERROR: "); - Serial.println(error.c_str()); + //Serial.println("ERROR: "); + //Serial.println(error.c_str()); delete client; return nullptr; } @@ -83,7 +86,7 @@ models::Product *DolibarrClient::get_product_by_id(const char* id_product) const std::vector *DolibarrClient::list_warehouse() const { HTTPClient *client = this->build_url(API_LIST_WAREHOUSE_URL); if (client->GET() == HTTP_CODE_OK) { - StaticJsonDocument doc; + DynamicJsonDocument doc(8192); DeserializationError error = deserializeJson(doc, client->getString().c_str()); if (error) { Serial.println("ERROR: "); @@ -94,7 +97,8 @@ std::vector *DolibarrClient::list_warehouse() const { auto *warehouses = new std::vector(); for (auto obj : doc.as()) { models::Warehouse warehouse = {}; - warehouse.id = obj["id"]; + warehouse.id = obj["id"].as(); + warehouse.label = obj["label"].as(); warehouses->push_back(warehouse); } delete client; @@ -105,8 +109,8 @@ std::vector *DolibarrClient::list_warehouse() const { } int DolibarrClient::create_movement(models::CreateProductStock &stock) const { - HTTPClient *client = this->build_url("API_CREATE_STOCKS_MOVEMENTS_URL"); - StaticJsonDocument doc; + HTTPClient *client = this->build_url(API_CREATE_STOCKS_MOVEMENTS_URL); + DynamicJsonDocument doc(4096); std::string result; doc["product_id"] = stock.product_id; doc["warehouse_id"] = stock.warehouse_id; @@ -122,30 +126,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; } \ No newline at end of file diff --git a/lib/DolibarrClient/src/DolibarrModels.h b/lib/DolibarrClient/src/DolibarrModels.h index 1443119..3e59381 100644 --- a/lib/DolibarrClient/src/DolibarrModels.h +++ b/lib/DolibarrClient/src/DolibarrModels.h @@ -20,9 +20,9 @@ namespace models { }; struct ProductStock { - const char* id; - const char* product_id; - const char* quantity; + std::string id; + std::string product_id; + std::string quantity; }; struct CreateProductStock { @@ -32,7 +32,8 @@ namespace models { }; struct Warehouse { - const char* id; + std::string id; + std::string label; }; } diff --git a/lib/M5LCD/src/M5LCD.cpp b/lib/M5LCD/src/M5LCD.cpp new file mode 100644 index 0000000..542230f --- /dev/null +++ b/lib/M5LCD/src/M5LCD.cpp @@ -0,0 +1,186 @@ +#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}) { + 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, 80, 320, 70, BLUE); + M5.Lcd.drawRect(0, 120, 320, 100, BLUE); + //M5.Lcd.fillRect(180, 30, 122, 10, BLUE); + /*M5.Lcd.setTextColor(WHITE, BLACK); + M5.Lcd.setTextSize(1); + M5.Lcd.setCursor(0, 0); + M5.Lcd.println("T-IOT 901"); + M5.Lcd.setCursor(0, 20); + M5.Lcd.println("Convoyeur"); + M5.Lcd.setCursor(0, 40); + M5.Lcd.println("Version 1.0"); + M5.Lcd.setCursor(0, 60); + M5.Lcd.println("By T-IOT");*/ + M5.Lcd.setTextSize(1); + M5.Lcd.setTextColor(WHITE, BLACK); + 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(); + } +} + +/* + * 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; +} diff --git a/lib/M5LCD/src/M5LCD.h b/lib/M5LCD/src/M5LCD.h new file mode 100644 index 0000000..b49b351 --- /dev/null +++ b/lib/M5LCD/src/M5LCD.h @@ -0,0 +1,73 @@ +#ifndef T_IOT_901_CONVOYOR_M5LCD_H +#define T_IOT_901_CONVOYOR_M5LCD_H + +#include +#include +#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); +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 _current_page; + int _debug_loc_y; + std::vector _logs; + ComponentsStatus _components_status; +}; + +inline M5LCD *lcdScreen; + +#endif //T_IOT_901_CONVOYOR_M5LCD_H diff --git a/src/Program.cpp b/src/Program.cpp index 8454899..fbadc8b 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -1,29 +1,52 @@ #include "Program.h" #include "Arduino.h" +#include "M5LCD.h" #include "DolibarrClient.h" 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; } Program::Program() { + /*lcd = new M5LCD();*/ + lcdScreen = new M5LCD(); + lcdScreen->add_log("Initialize M5LCD component...."); Serial.begin(MONITOR_SPEED); 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(); + 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); + auto *warehouses = this->client->list_warehouse(); + if (warehouses != nullptr) { + lcdScreen->add_log("Warehouses found !"); + lcdScreen->set_dolibarr_status(COMPONENT_OK); + for (auto &a : *warehouses) { + char buffer[50]; + sprintf(buffer, "+ Warehouse '%s' (%s)", a.label.c_str(), a.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); + struct WifiConfig wifi_c = {WIFI_SSID, WIFI_PASSWORD}; + initialize_wifi(wifi_c); + } }