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

Création du composant LCD, rajout des écrans de logs et du dashboard

Browse Source
This commit is contained in:
Nicolas SANS
2024-01-19 16:40:28 +01:00
parent b7fe429508
commit 4f3a5bda03
7 changed files with 310 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

186
lib/M5LCD/src/M5LCD.cpp Normal file
View File

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

73
lib/M5LCD/src/M5LCD.h Normal file
View File

@ -0,0 +1,73 @@
#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);
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<LogMessage> _logs;
ComponentsStatus _components_status;
};
inline M5LCD *lcdScreen;
#endif //T_IOT_901_CONVOYOR_M5LCD_H