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

Merge remote-tracking branch 'origin/develop' into feat/m5_lcd

Browse Source 
# Conflicts:
#	config.ini
#	src/Program.cpp
This commit is contained in:
Nicolas SANS
2024-01-19 16:48:08 +01:00
parent 4f3a5bda03 c498489cbb
commit 2c22e0a538
11 changed files with 2693 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Program.cpp
View File

@ -2,6 +2,7 @@
#include "Arduino.h"
#include "M5LCD.h"
#include "DolibarrClient.h"
#include "ServoMotorComponent.h"
int initialize_wifi(WifiConfig wifi) {
lcdScreen->add_log("Connecting to the WiFi network...");
@ -12,10 +13,10 @@ int initialize_wifi(WifiConfig wifi) {
}
Program::Program() {
/*lcd = new M5LCD();*/
Serial.begin(MONITOR_SPEED);
this->servo = new ServoMotorComponent(2, 1, 0.1);
lcdScreen = new M5LCD();
lcdScreen->add_log("Initialize M5LCD component....");
Serial.begin(MONITOR_SPEED);
struct WifiConfig wifi_c = {WIFI_SSID, WIFI_PASSWORD};
initialize_wifi(wifi_c);
@ -23,6 +24,8 @@ Program::Program() {
void Program::loop() {
lcdScreen->update();
this->servo->refresh();
this->servo->setDesiredPosition(Position::LEFT);
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);