From 01b99d9716af6dda8291126a2c3c754bb7c3df67 Mon Sep 17 00:00:00 2001 From: Mathis Date: Thu, 16 Nov 2023 09:55:30 +0100 Subject: [PATCH 01/15] [feature/Servo_Motor] - add ServoMotorComponent --- .vscode/settings.json | 5 +++ .../ServoMotorComponent.cpp | 32 +++++++++++++++++++ lib/ServoMotorComponent/ServoMotorComponent.h | 27 ++++++++++++++++ platformio.ini | 1 + 4 files changed, 65 insertions(+) create mode 100644 .vscode/settings.json create mode 100644 lib/ServoMotorComponent/ServoMotorComponent.cpp create mode 100644 lib/ServoMotorComponent/ServoMotorComponent.h diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..03ba48b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "new": "cpp" + } +} \ No newline at end of file diff --git a/lib/ServoMotorComponent/ServoMotorComponent.cpp b/lib/ServoMotorComponent/ServoMotorComponent.cpp new file mode 100644 index 0000000..11c6871 --- /dev/null +++ b/lib/ServoMotorComponent/ServoMotorComponent.cpp @@ -0,0 +1,32 @@ +#include "ServoMotorComponent.h" + +ServoMotorComponent::ServoMotorComponent(int PIN) { + this->PIN = PIN; + this->position = 0; + this->myservo.attach(PIN); + this->myservo.write(0); +} + +void ServoMotorComponent::goLeft() { + this->myservo.write(0); + this->position = 0; +} + +void ServoMotorComponent::goRight() { + this->myservo.write(180); + this->position = 180; +} + +void ServoMotorComponent::goMiddle() { + this->myservo.write(90); + this->position = 90; +} + +int ServoMotorComponent::getPosition() { + return this->position; +} + +void ServoMotorComponent::setPin(int PIN) { + this->PIN = PIN; + this->myservo.attach(PIN); +} diff --git a/lib/ServoMotorComponent/ServoMotorComponent.h b/lib/ServoMotorComponent/ServoMotorComponent.h new file mode 100644 index 0000000..c5a08c1 --- /dev/null +++ b/lib/ServoMotorComponent/ServoMotorComponent.h @@ -0,0 +1,27 @@ +#ifndef SERVOMOTOT_COMPONENT_H +#define SERVOMOTOT_COMPONENT_H + +#include + +class ServoMotorComponent +{ +public: + ServoMotorComponent(int PIN); + ~ServoMotorComponent() = default; + void goLeft(); + void goRight(); + void goMiddle(); + int getPosition(); + void setPin(int PIN); + +private: + int PIN; + int position; + Servo myservo; +}; + + + + + +#endif //SERVOMOTOT_COMPONENT_H diff --git a/platformio.ini b/platformio.ini index 9724c56..fb42dd8 100644 --- a/platformio.ini +++ b/platformio.ini @@ -54,6 +54,7 @@ lib_deps = bblanchon/ArduinoJson@^6.21.3 ; JSON serializer et deserializer m5stack/M5Stack@^0.4.5 ; M5 Lib m5stack/M5GFX@^0.1.9 ; M5 Lib pour le LCD + arduino-libraries/Servo@^1.2.1 ; Lib pour le Servo Motor ; example: ; erropix/ESP32 AnalogWrite@0.2 From 844cbf817ccdd6eea76c87962b9afa0c51cbf79a Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 17 Nov 2023 09:59:15 +0100 Subject: [PATCH 02/15] [feature/ServoMotor] - change servo librarie --- lib/ServoMotorComponent/{ => src}/ServoMotorComponent.cpp | 8 ++++---- lib/ServoMotorComponent/{ => src}/ServoMotorComponent.h | 0 platformio.ini | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename lib/ServoMotorComponent/{ => src}/ServoMotorComponent.cpp (80%) rename lib/ServoMotorComponent/{ => src}/ServoMotorComponent.h (100%) diff --git a/lib/ServoMotorComponent/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp similarity index 80% rename from lib/ServoMotorComponent/ServoMotorComponent.cpp rename to lib/ServoMotorComponent/src/ServoMotorComponent.cpp index 11c6871..fef7531 100644 --- a/lib/ServoMotorComponent/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -4,21 +4,21 @@ ServoMotorComponent::ServoMotorComponent(int PIN) { this->PIN = PIN; this->position = 0; this->myservo.attach(PIN); - this->myservo.write(0); } void ServoMotorComponent::goLeft() { - this->myservo.write(0); + this->myservo.write(this->PIN, 0); this->position = 0; } void ServoMotorComponent::goRight() { - this->myservo.write(180); + this->myservo.write(this->PIN, 180); + this->position = 180; } void ServoMotorComponent::goMiddle() { - this->myservo.write(90); + this->myservo.write(this->PIN, 90); this->position = 90; } diff --git a/lib/ServoMotorComponent/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h similarity index 100% rename from lib/ServoMotorComponent/ServoMotorComponent.h rename to lib/ServoMotorComponent/src/ServoMotorComponent.h diff --git a/platformio.ini b/platformio.ini index fb42dd8..324e983 100644 --- a/platformio.ini +++ b/platformio.ini @@ -54,7 +54,7 @@ lib_deps = bblanchon/ArduinoJson@^6.21.3 ; JSON serializer et deserializer m5stack/M5Stack@^0.4.5 ; M5 Lib m5stack/M5GFX@^0.1.9 ; M5 Lib pour le LCD - arduino-libraries/Servo@^1.2.1 ; Lib pour le Servo Motor + dlloydev/ESP32 ESP32S2 AnalogWrite ; example: ; erropix/ESP32 AnalogWrite@0.2 From 3c7aea15a90eae1b2168056b19e48a840f475b67 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 8 Dec 2023 09:45:07 +0100 Subject: [PATCH 03/15] [ServoMotor] - rework servoMotor for adding speed and easing for movement --- include/Program.h | 2 ++ .../src/ServoMotorComponent.cpp | 26 ++++++++++++++++--- .../src/ServoMotorComponent.h | 5 ++++ src/Program.cpp | 25 +++++------------- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/include/Program.h b/include/Program.h index b4f30bb..4ceb880 100644 --- a/include/Program.h +++ b/include/Program.h @@ -4,6 +4,7 @@ #include "Arduino.h" #include "DolibarrClient.h" #include +#include "ServoMotorComponent.h" class Program { public: @@ -18,6 +19,7 @@ public: void loop(); private: DolibarrClient *client; + ServoMotorComponent *servo; }; #endif diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index fef7531..4a67a25 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -2,23 +2,25 @@ ServoMotorComponent::ServoMotorComponent(int PIN) { this->PIN = PIN; - this->position = 0; + this->position = 30; + this->speed = 100; + this->easing = 0.5; this->myservo.attach(PIN); } void ServoMotorComponent::goLeft() { - this->myservo.write(this->PIN, 0); + this->myservo.write(this->PIN, 52, this->speed, this->easing); this->position = 0; } void ServoMotorComponent::goRight() { - this->myservo.write(this->PIN, 180); + this->myservo.write(this->PIN, 18, this->speed, this->easing); this->position = 180; } void ServoMotorComponent::goMiddle() { - this->myservo.write(this->PIN, 90); + this->myservo.write(this->PIN, 32, this->speed, this->easing); this->position = 90; } @@ -29,4 +31,20 @@ int ServoMotorComponent::getPosition() { void ServoMotorComponent::setPin(int PIN) { this->PIN = PIN; this->myservo.attach(PIN); + return; +} + +void ServoMotorComponent::setSpeed(int speed) { + this->speed = speed; + return; +} + +void ServoMotorComponent::pause() { + this->myservo.pause(); + return; +} + +void ServoMotorComponent::setEasing(float easing) { + this->easing = easing; + return; } diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h index c5a08c1..3d74c92 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.h +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.h @@ -13,10 +13,15 @@ public: void goMiddle(); int getPosition(); void setPin(int PIN); + void pause(); + void setSpeed(int speed); + void setEasing(float easing); private: int PIN; int position; + int speed; + float easing; Servo myservo; }; diff --git a/src/Program.cpp b/src/Program.cpp index 8454899..3d7ebe7 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -2,28 +2,17 @@ #include "Arduino.h" #include "DolibarrClient.h" -int initialize_wifi(WifiConfig wifi) { - 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() { - 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); + this->servo = new ServoMotorComponent(2); } void Program::loop() { + // this->servo->goLeft(); + // delay(3000); + this->servo->goMiddle(); + // delay(3000); + // this->servo->goRight(); + // delay(3000); } From a66882e87778f64699e44e0b9ed16d161e90fe14 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 19 Jan 2024 09:48:21 +0100 Subject: [PATCH 04/15] Refacto servoMotor --- .../src/ServoMotorComponent.cpp | 70 ++++++++++--------- .../src/ServoMotorComponent.h | 26 ++++--- 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index 4a67a25..2b9a515 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -1,50 +1,56 @@ #include "ServoMotorComponent.h" -ServoMotorComponent::ServoMotorComponent(int PIN) { +ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod) { this->PIN = PIN; - this->position = 30; - this->speed = 100; - this->easing = 0.5; this->myservo.attach(PIN); + this->desiredposition = Position::MIDDLE; + this->currentPosition = 0; + this->lastUpTime = millis(); + this->updatePeriod = updatePeriod; } -void ServoMotorComponent::goLeft() { - this->myservo.write(this->PIN, 52, this->speed, this->easing); - this->position = 0; +int ServoMotorComponent::getCurrentPosition() { + return this->myservo.read(this->PIN); } -void ServoMotorComponent::goRight() { - this->myservo.write(this->PIN, 18, this->speed, this->easing); - - this->position = 180; +void ServoMotorComponent::setCurrentPosition() { + this->currentPosition = this->myservo.read(this->PIN); } -void ServoMotorComponent::goMiddle() { - this->myservo.write(this->PIN, 32, this->speed, this->easing); - this->position = 90; +void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { + switch (desiredPosition) { + case Position::LEFT: + this->desiredposition = 52; + break; + case Position::MIDDLE: + this->desiredposition = 32; + break; + case Position::RIGHT: + this->desiredposition = 18; + break; + default: + break; + } } -int ServoMotorComponent::getPosition() { - return this->position; + +void ServoMotorComponent::refresh() { + if (this->desiredposition == this->currentPosition + || millis() - this->lastUpTime <= this->updatePeriod) return; + + if (this->currentPosition > this->desiredposition) { + this->currentPosition--; + } + if (this->currentPosition < this->desiredposition) { + this->currentPosition++; + } + this->lastUpTime = millis(); + this->myservo.write(this->PIN, this->currentPosition); } + void ServoMotorComponent::setPin(int PIN) { this->PIN = PIN; this->myservo.attach(PIN); return; -} - -void ServoMotorComponent::setSpeed(int speed) { - this->speed = speed; - return; -} - -void ServoMotorComponent::pause() { - this->myservo.pause(); - return; -} - -void ServoMotorComponent::setEasing(float easing) { - this->easing = easing; - return; -} +} \ No newline at end of file diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h index 3d74c92..4ea850d 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.h +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.h @@ -3,26 +3,30 @@ #include +enum Position { + LEFT, + MIDDLE, + RIGHT +}; + class ServoMotorComponent { public: - ServoMotorComponent(int PIN); + ServoMotorComponent(int PIN, unsigned long updatePeriod); ~ServoMotorComponent() = default; - void goLeft(); - void goRight(); - void goMiddle(); - int getPosition(); + int getCurrentPosition(); + void setCurrentPosition(); + void setDesiredPosition(Position desiredPosition); void setPin(int PIN); - void pause(); - void setSpeed(int speed); - void setEasing(float easing); + void refresh(); private: int PIN; - int position; - int speed; - float easing; + int currentPosition; + int desiredposition; Servo myservo; + unsigned long lastUpTime; + unsigned long updatePeriod; }; From 81c9ececf6cc0b6c87f7b4c743ef05dd36d26112 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 19 Jan 2024 11:35:25 +0100 Subject: [PATCH 05/15] Retour Clement --- .../src/ServoMotorComponent.cpp | 37 ++++++++++--------- .../src/ServoMotorComponent.h | 11 ++---- src/Program.cpp | 25 +++++++++---- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index 2b9a515..d23dd40 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -1,22 +1,29 @@ #include "ServoMotorComponent.h" -ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod) { + +///////////////////////////////////////////////////////////////////////////////////// +// 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 = 0; + this->currentPosition = 32; this->lastUpTime = millis(); this->updatePeriod = updatePeriod; + this->step = step; + this->myservo.write(this->PIN, this->currentPosition); } -int ServoMotorComponent::getCurrentPosition() { - return this->myservo.read(this->PIN); -} - -void ServoMotorComponent::setCurrentPosition() { - this->currentPosition = this->myservo.read(this->PIN); -} - +/** + * Set the desired position + * @desiredPosition: Give desired position + */ void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { switch (desiredPosition) { case Position::LEFT: @@ -34,6 +41,9 @@ void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { } +/** + * Write a new servoMotor position when it's necessary + */ void ServoMotorComponent::refresh() { if (this->desiredposition == this->currentPosition || millis() - this->lastUpTime <= this->updatePeriod) return; @@ -46,11 +56,4 @@ void ServoMotorComponent::refresh() { } this->lastUpTime = millis(); this->myservo.write(this->PIN, this->currentPosition); -} - - -void ServoMotorComponent::setPin(int PIN) { - this->PIN = PIN; - this->myservo.attach(PIN); - return; } \ No newline at end of file diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h index 4ea850d..e493743 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.h +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.h @@ -12,21 +12,18 @@ enum Position { class ServoMotorComponent { public: - ServoMotorComponent(int PIN, unsigned long updatePeriod); - ~ServoMotorComponent() = default; - int getCurrentPosition(); - void setCurrentPosition(); + ServoMotorComponent(int PIN, unsigned long updatePeriod, float step = 1); void setDesiredPosition(Position desiredPosition); - void setPin(int PIN); void refresh(); private: int PIN; - int currentPosition; - int desiredposition; + float currentPosition; + float desiredposition; Servo myservo; unsigned long lastUpTime; unsigned long updatePeriod; + float step; }; diff --git a/src/Program.cpp b/src/Program.cpp index 3d7ebe7..8454899 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -2,17 +2,28 @@ #include "Arduino.h" #include "DolibarrClient.h" +int initialize_wifi(WifiConfig wifi) { + 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() { - this->servo = new ServoMotorComponent(2); + 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() { - // this->servo->goLeft(); - // delay(3000); - this->servo->goMiddle(); - // delay(3000); - // this->servo->goRight(); - // delay(3000); } From 1e59d9dc46bcec92ef8e3a10718a2e0a356ec509 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 19 Jan 2024 16:37:35 +0100 Subject: [PATCH 06/15] add config.ini --- config.ini | 7 +++++++ lib/ServoMotorComponent/src/ServoMotorComponent.cpp | 12 ++++++------ src/Program.cpp | 12 ++++++++---- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/config.ini b/config.ini index dff2d75..4c3c3ba 100644 --- a/config.ini +++ b/config.ini @@ -14,3 +14,10 @@ build_flags = -D MONITOR_SPEED=${config.monitor_speed} ; DO NOT TOUCH --- END -D WAITING_WIFI_DELAY=1000 + + ;;;;;;;;;;;;;;;;;;;;;; + ;;; Servo config ;;; + ;;;;;;;;;;;;;;;;;;;;;; + -D RIGHT_POS=18 + -D MIDDLE_POS=32 + -D LEFT_POS=52 diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index d23dd40..950e1c7 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -13,7 +13,7 @@ ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod, f this->PIN = PIN; this->myservo.attach(PIN); this->desiredposition = Position::MIDDLE; - this->currentPosition = 32; + this->currentPosition = MIDDLE_POS; this->lastUpTime = millis(); this->updatePeriod = updatePeriod; this->step = step; @@ -27,13 +27,13 @@ ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod, f void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { switch (desiredPosition) { case Position::LEFT: - this->desiredposition = 52; + this->desiredposition = LEFT_POS; break; case Position::MIDDLE: - this->desiredposition = 32; + this->desiredposition = MIDDLE_POS; break; case Position::RIGHT: - this->desiredposition = 18; + this->desiredposition = RIGHT_POS; break; default: break; @@ -49,10 +49,10 @@ void ServoMotorComponent::refresh() { || millis() - this->lastUpTime <= this->updatePeriod) return; if (this->currentPosition > this->desiredposition) { - this->currentPosition--; + this->currentPosition -= this->step; } if (this->currentPosition < this->desiredposition) { - this->currentPosition++; + this->currentPosition += this->step; } this->lastUpTime = millis(); this->myservo.write(this->PIN, this->currentPosition); diff --git a/src/Program.cpp b/src/Program.cpp index 8454899..0126fe1 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -1,6 +1,7 @@ #include "Program.h" #include "Arduino.h" #include "DolibarrClient.h" +#include "ServoMotorComponent.h" int initialize_wifi(WifiConfig wifi) { WiFiClass::mode(WIFI_STA); //Optional @@ -17,13 +18,16 @@ int initialize_wifi(WifiConfig wifi) { Program::Program() { 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); + this->servo = new ServoMotorComponent(2, 1, 0.1); + //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() { + this->servo->refresh(); + this->servo->setDesiredPosition(Position::LEFT); } From f3dc069f3b78b28a6e0dc60a9ead435904bbb1b3 Mon Sep 17 00:00:00 2001 From: Mathis Date: Thu, 16 Nov 2023 09:55:30 +0100 Subject: [PATCH 07/15] [feature/Servo_Motor] - add ServoMotorComponent --- .vscode/settings.json | 5 +++ .../ServoMotorComponent.cpp | 32 +++++++++++++++++++ lib/ServoMotorComponent/ServoMotorComponent.h | 27 ++++++++++++++++ platformio.ini | 1 + 4 files changed, 65 insertions(+) create mode 100644 .vscode/settings.json create mode 100644 lib/ServoMotorComponent/ServoMotorComponent.cpp create mode 100644 lib/ServoMotorComponent/ServoMotorComponent.h diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..03ba48b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "new": "cpp" + } +} \ No newline at end of file diff --git a/lib/ServoMotorComponent/ServoMotorComponent.cpp b/lib/ServoMotorComponent/ServoMotorComponent.cpp new file mode 100644 index 0000000..11c6871 --- /dev/null +++ b/lib/ServoMotorComponent/ServoMotorComponent.cpp @@ -0,0 +1,32 @@ +#include "ServoMotorComponent.h" + +ServoMotorComponent::ServoMotorComponent(int PIN) { + this->PIN = PIN; + this->position = 0; + this->myservo.attach(PIN); + this->myservo.write(0); +} + +void ServoMotorComponent::goLeft() { + this->myservo.write(0); + this->position = 0; +} + +void ServoMotorComponent::goRight() { + this->myservo.write(180); + this->position = 180; +} + +void ServoMotorComponent::goMiddle() { + this->myservo.write(90); + this->position = 90; +} + +int ServoMotorComponent::getPosition() { + return this->position; +} + +void ServoMotorComponent::setPin(int PIN) { + this->PIN = PIN; + this->myservo.attach(PIN); +} diff --git a/lib/ServoMotorComponent/ServoMotorComponent.h b/lib/ServoMotorComponent/ServoMotorComponent.h new file mode 100644 index 0000000..c5a08c1 --- /dev/null +++ b/lib/ServoMotorComponent/ServoMotorComponent.h @@ -0,0 +1,27 @@ +#ifndef SERVOMOTOT_COMPONENT_H +#define SERVOMOTOT_COMPONENT_H + +#include + +class ServoMotorComponent +{ +public: + ServoMotorComponent(int PIN); + ~ServoMotorComponent() = default; + void goLeft(); + void goRight(); + void goMiddle(); + int getPosition(); + void setPin(int PIN); + +private: + int PIN; + int position; + Servo myservo; +}; + + + + + +#endif //SERVOMOTOT_COMPONENT_H diff --git a/platformio.ini b/platformio.ini index 590c0d3..03efb22 100644 --- a/platformio.ini +++ b/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) + arduino-libraries/Servo@^1.2.1 ; Lib pour le Servo Motor ; example: ; erropix/ESP32 AnalogWrite@0.2 From 027015b33b58a04f5ffa742c99ee3fc0d5cbb6ab Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 17 Nov 2023 09:59:15 +0100 Subject: [PATCH 08/15] [feature/ServoMotor] - change servo librarie --- lib/ServoMotorComponent/{ => src}/ServoMotorComponent.cpp | 8 ++++---- lib/ServoMotorComponent/{ => src}/ServoMotorComponent.h | 0 platformio.ini | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) rename lib/ServoMotorComponent/{ => src}/ServoMotorComponent.cpp (80%) rename lib/ServoMotorComponent/{ => src}/ServoMotorComponent.h (100%) diff --git a/lib/ServoMotorComponent/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp similarity index 80% rename from lib/ServoMotorComponent/ServoMotorComponent.cpp rename to lib/ServoMotorComponent/src/ServoMotorComponent.cpp index 11c6871..fef7531 100644 --- a/lib/ServoMotorComponent/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -4,21 +4,21 @@ ServoMotorComponent::ServoMotorComponent(int PIN) { this->PIN = PIN; this->position = 0; this->myservo.attach(PIN); - this->myservo.write(0); } void ServoMotorComponent::goLeft() { - this->myservo.write(0); + this->myservo.write(this->PIN, 0); this->position = 0; } void ServoMotorComponent::goRight() { - this->myservo.write(180); + this->myservo.write(this->PIN, 180); + this->position = 180; } void ServoMotorComponent::goMiddle() { - this->myservo.write(90); + this->myservo.write(this->PIN, 90); this->position = 90; } diff --git a/lib/ServoMotorComponent/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h similarity index 100% rename from lib/ServoMotorComponent/ServoMotorComponent.h rename to lib/ServoMotorComponent/src/ServoMotorComponent.h diff --git a/platformio.ini b/platformio.ini index 03efb22..f926a91 100644 --- a/platformio.ini +++ b/platformio.ini @@ -55,7 +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) - arduino-libraries/Servo@^1.2.1 ; Lib pour le Servo Motor + dlloydev/ESP32 ESP32S2 AnalogWrite ; Lib pour le Servo Motor ; example: ; erropix/ESP32 AnalogWrite@0.2 From 9a8a84a59e352beb835e723fd60946dc74134ac6 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 8 Dec 2023 09:45:07 +0100 Subject: [PATCH 09/15] [ServoMotor] - rework servoMotor for adding speed and easing for movement --- include/Program.h | 2 ++ .../src/ServoMotorComponent.cpp | 26 ++++++++++++++++--- .../src/ServoMotorComponent.h | 5 ++++ src/Program.cpp | 25 +++++------------- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/include/Program.h b/include/Program.h index b4f30bb..4ceb880 100644 --- a/include/Program.h +++ b/include/Program.h @@ -4,6 +4,7 @@ #include "Arduino.h" #include "DolibarrClient.h" #include +#include "ServoMotorComponent.h" class Program { public: @@ -18,6 +19,7 @@ public: void loop(); private: DolibarrClient *client; + ServoMotorComponent *servo; }; #endif diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index fef7531..4a67a25 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -2,23 +2,25 @@ ServoMotorComponent::ServoMotorComponent(int PIN) { this->PIN = PIN; - this->position = 0; + this->position = 30; + this->speed = 100; + this->easing = 0.5; this->myservo.attach(PIN); } void ServoMotorComponent::goLeft() { - this->myservo.write(this->PIN, 0); + this->myservo.write(this->PIN, 52, this->speed, this->easing); this->position = 0; } void ServoMotorComponent::goRight() { - this->myservo.write(this->PIN, 180); + this->myservo.write(this->PIN, 18, this->speed, this->easing); this->position = 180; } void ServoMotorComponent::goMiddle() { - this->myservo.write(this->PIN, 90); + this->myservo.write(this->PIN, 32, this->speed, this->easing); this->position = 90; } @@ -29,4 +31,20 @@ int ServoMotorComponent::getPosition() { void ServoMotorComponent::setPin(int PIN) { this->PIN = PIN; this->myservo.attach(PIN); + return; +} + +void ServoMotorComponent::setSpeed(int speed) { + this->speed = speed; + return; +} + +void ServoMotorComponent::pause() { + this->myservo.pause(); + return; +} + +void ServoMotorComponent::setEasing(float easing) { + this->easing = easing; + return; } diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h index c5a08c1..3d74c92 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.h +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.h @@ -13,10 +13,15 @@ public: void goMiddle(); int getPosition(); void setPin(int PIN); + void pause(); + void setSpeed(int speed); + void setEasing(float easing); private: int PIN; int position; + int speed; + float easing; Servo myservo; }; diff --git a/src/Program.cpp b/src/Program.cpp index 8454899..3d7ebe7 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -2,28 +2,17 @@ #include "Arduino.h" #include "DolibarrClient.h" -int initialize_wifi(WifiConfig wifi) { - 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() { - 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); + this->servo = new ServoMotorComponent(2); } void Program::loop() { + // this->servo->goLeft(); + // delay(3000); + this->servo->goMiddle(); + // delay(3000); + // this->servo->goRight(); + // delay(3000); } From dea01d3e8454b113f4124984388c901f83263f0b Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 19 Jan 2024 09:48:21 +0100 Subject: [PATCH 10/15] Refacto servoMotor --- .../src/ServoMotorComponent.cpp | 70 ++++++++++--------- .../src/ServoMotorComponent.h | 26 ++++--- 2 files changed, 53 insertions(+), 43 deletions(-) diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index 4a67a25..2b9a515 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -1,50 +1,56 @@ #include "ServoMotorComponent.h" -ServoMotorComponent::ServoMotorComponent(int PIN) { +ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod) { this->PIN = PIN; - this->position = 30; - this->speed = 100; - this->easing = 0.5; this->myservo.attach(PIN); + this->desiredposition = Position::MIDDLE; + this->currentPosition = 0; + this->lastUpTime = millis(); + this->updatePeriod = updatePeriod; } -void ServoMotorComponent::goLeft() { - this->myservo.write(this->PIN, 52, this->speed, this->easing); - this->position = 0; +int ServoMotorComponent::getCurrentPosition() { + return this->myservo.read(this->PIN); } -void ServoMotorComponent::goRight() { - this->myservo.write(this->PIN, 18, this->speed, this->easing); - - this->position = 180; +void ServoMotorComponent::setCurrentPosition() { + this->currentPosition = this->myservo.read(this->PIN); } -void ServoMotorComponent::goMiddle() { - this->myservo.write(this->PIN, 32, this->speed, this->easing); - this->position = 90; +void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { + switch (desiredPosition) { + case Position::LEFT: + this->desiredposition = 52; + break; + case Position::MIDDLE: + this->desiredposition = 32; + break; + case Position::RIGHT: + this->desiredposition = 18; + break; + default: + break; + } } -int ServoMotorComponent::getPosition() { - return this->position; + +void ServoMotorComponent::refresh() { + if (this->desiredposition == this->currentPosition + || millis() - this->lastUpTime <= this->updatePeriod) return; + + if (this->currentPosition > this->desiredposition) { + this->currentPosition--; + } + if (this->currentPosition < this->desiredposition) { + this->currentPosition++; + } + this->lastUpTime = millis(); + this->myservo.write(this->PIN, this->currentPosition); } + void ServoMotorComponent::setPin(int PIN) { this->PIN = PIN; this->myservo.attach(PIN); return; -} - -void ServoMotorComponent::setSpeed(int speed) { - this->speed = speed; - return; -} - -void ServoMotorComponent::pause() { - this->myservo.pause(); - return; -} - -void ServoMotorComponent::setEasing(float easing) { - this->easing = easing; - return; -} +} \ No newline at end of file diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h index 3d74c92..4ea850d 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.h +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.h @@ -3,26 +3,30 @@ #include +enum Position { + LEFT, + MIDDLE, + RIGHT +}; + class ServoMotorComponent { public: - ServoMotorComponent(int PIN); + ServoMotorComponent(int PIN, unsigned long updatePeriod); ~ServoMotorComponent() = default; - void goLeft(); - void goRight(); - void goMiddle(); - int getPosition(); + int getCurrentPosition(); + void setCurrentPosition(); + void setDesiredPosition(Position desiredPosition); void setPin(int PIN); - void pause(); - void setSpeed(int speed); - void setEasing(float easing); + void refresh(); private: int PIN; - int position; - int speed; - float easing; + int currentPosition; + int desiredposition; Servo myservo; + unsigned long lastUpTime; + unsigned long updatePeriod; }; From 15bd7c774186d26c79cce45a371d8bceb7495e52 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 19 Jan 2024 11:35:25 +0100 Subject: [PATCH 11/15] Retour Clement --- .../src/ServoMotorComponent.cpp | 37 ++++++++++--------- .../src/ServoMotorComponent.h | 11 ++---- src/Program.cpp | 25 +++++++++---- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index 2b9a515..d23dd40 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -1,22 +1,29 @@ #include "ServoMotorComponent.h" -ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod) { + +///////////////////////////////////////////////////////////////////////////////////// +// 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 = 0; + this->currentPosition = 32; this->lastUpTime = millis(); this->updatePeriod = updatePeriod; + this->step = step; + this->myservo.write(this->PIN, this->currentPosition); } -int ServoMotorComponent::getCurrentPosition() { - return this->myservo.read(this->PIN); -} - -void ServoMotorComponent::setCurrentPosition() { - this->currentPosition = this->myservo.read(this->PIN); -} - +/** + * Set the desired position + * @desiredPosition: Give desired position + */ void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { switch (desiredPosition) { case Position::LEFT: @@ -34,6 +41,9 @@ void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { } +/** + * Write a new servoMotor position when it's necessary + */ void ServoMotorComponent::refresh() { if (this->desiredposition == this->currentPosition || millis() - this->lastUpTime <= this->updatePeriod) return; @@ -46,11 +56,4 @@ void ServoMotorComponent::refresh() { } this->lastUpTime = millis(); this->myservo.write(this->PIN, this->currentPosition); -} - - -void ServoMotorComponent::setPin(int PIN) { - this->PIN = PIN; - this->myservo.attach(PIN); - return; } \ No newline at end of file diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h index 4ea850d..e493743 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.h +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.h @@ -12,21 +12,18 @@ enum Position { class ServoMotorComponent { public: - ServoMotorComponent(int PIN, unsigned long updatePeriod); - ~ServoMotorComponent() = default; - int getCurrentPosition(); - void setCurrentPosition(); + ServoMotorComponent(int PIN, unsigned long updatePeriod, float step = 1); void setDesiredPosition(Position desiredPosition); - void setPin(int PIN); void refresh(); private: int PIN; - int currentPosition; - int desiredposition; + float currentPosition; + float desiredposition; Servo myservo; unsigned long lastUpTime; unsigned long updatePeriod; + float step; }; diff --git a/src/Program.cpp b/src/Program.cpp index 3d7ebe7..8454899 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -2,17 +2,28 @@ #include "Arduino.h" #include "DolibarrClient.h" +int initialize_wifi(WifiConfig wifi) { + 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() { - this->servo = new ServoMotorComponent(2); + 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() { - // this->servo->goLeft(); - // delay(3000); - this->servo->goMiddle(); - // delay(3000); - // this->servo->goRight(); - // delay(3000); } From 4f3a5bda0351a46c5c1dc10578fe43358a3c615c Mon Sep 17 00:00:00 2001 From: Nicolas SANS Date: Fri, 19 Jan 2024 16:40:28 +0100 Subject: [PATCH 12/15] =?UTF-8?q?Cr=C3=A9ation=20du=20composant=20LCD,=20r?= =?UTF-8?q?ajout=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); + } } From fe671182cd0470bf65514e1f2a33bad1e1417d09 Mon Sep 17 00:00:00 2001 From: Mathis Date: Fri, 19 Jan 2024 16:37:35 +0100 Subject: [PATCH 13/15] add config.ini --- config.ini | 5 +++++ lib/ServoMotorComponent/src/ServoMotorComponent.cpp | 12 ++++++------ src/Program.cpp | 12 ++++++++---- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/config.ini b/config.ini index 89f0c25..5052dee 100644 --- a/config.ini +++ b/config.ini @@ -27,3 +27,8 @@ build_flags = ; nfc addr -D NFC_ADDR=0x28 + ;;; Servo config ;;; + ;;;;;;;;;;;;;;;;;;;;;; + -D RIGHT_POS=18 + -D MIDDLE_POS=32 + -D LEFT_POS=52 diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index d23dd40..950e1c7 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -13,7 +13,7 @@ ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod, f this->PIN = PIN; this->myservo.attach(PIN); this->desiredposition = Position::MIDDLE; - this->currentPosition = 32; + this->currentPosition = MIDDLE_POS; this->lastUpTime = millis(); this->updatePeriod = updatePeriod; this->step = step; @@ -27,13 +27,13 @@ ServoMotorComponent::ServoMotorComponent(int PIN, unsigned long updatePeriod, f void ServoMotorComponent::setDesiredPosition(Position desiredPosition) { switch (desiredPosition) { case Position::LEFT: - this->desiredposition = 52; + this->desiredposition = LEFT_POS; break; case Position::MIDDLE: - this->desiredposition = 32; + this->desiredposition = MIDDLE_POS; break; case Position::RIGHT: - this->desiredposition = 18; + this->desiredposition = RIGHT_POS; break; default: break; @@ -49,10 +49,10 @@ void ServoMotorComponent::refresh() { || millis() - this->lastUpTime <= this->updatePeriod) return; if (this->currentPosition > this->desiredposition) { - this->currentPosition--; + this->currentPosition -= this->step; } if (this->currentPosition < this->desiredposition) { - this->currentPosition++; + this->currentPosition += this->step; } this->lastUpTime = millis(); this->myservo.write(this->PIN, this->currentPosition); diff --git a/src/Program.cpp b/src/Program.cpp index 8454899..0126fe1 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -1,6 +1,7 @@ #include "Program.h" #include "Arduino.h" #include "DolibarrClient.h" +#include "ServoMotorComponent.h" int initialize_wifi(WifiConfig wifi) { WiFiClass::mode(WIFI_STA); //Optional @@ -17,13 +18,16 @@ int initialize_wifi(WifiConfig wifi) { Program::Program() { 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); + this->servo = new ServoMotorComponent(2, 1, 0.1); + //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() { + this->servo->refresh(); + this->servo->setDesiredPosition(Position::LEFT); } From 45cef130ca661504c69adec2bd78753b66eb0c98 Mon Sep 17 00:00:00 2001 From: Nicolas SANS Date: Thu, 25 Jan 2024 14:29:08 +0100 Subject: [PATCH 14/15] Ajout de l'algo --- config.ini | 3 +- config_api.ini | 1 + include/Program.h | 7 + lib/DolibarrClient/src/DolibarrClient.cpp | 49 +++++-- lib/DolibarrClient/src/DolibarrClient.h | 3 +- lib/DolibarrClient/src/DolibarrModels.h | 35 ++--- lib/M5LCD/src/M5LCD.cpp | 64 +++++++-- lib/M5LCD/src/M5LCD.h | 11 ++ lib/NFC/src/NfcReader.cpp | 7 + lib/NFC/src/NfcReader.h | 1 + .../src/ServoMotorComponent.cpp | 4 + .../src/ServoMotorComponent.h | 3 +- lib/WorldTime/src/WorldTime.cpp | 1 + lib/WorldTime/src/WorldTime.h | 6 + src/Program.cpp | 130 ++++++++++++++++-- 15 files changed, 270 insertions(+), 55 deletions(-) create mode 100644 lib/WorldTime/src/WorldTime.cpp create mode 100644 lib/WorldTime/src/WorldTime.h diff --git a/config.ini b/config.ini index 0dc9070..2db1cf2 100644 --- a/config.ini +++ b/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 ;;; ;;;;;;;;;;;;;;;;;;;;;; @@ -36,3 +36,4 @@ build_flags = -D RIGHT_POS=18 -D MIDDLE_POS=32 -D LEFT_POS=52 + -D CONVOYER_LEN=100 diff --git a/config_api.ini b/config_api.ini index e2bd551..595c228 100644 --- a/config_api.ini +++ b/config_api.ini @@ -4,6 +4,7 @@ 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/\" diff --git a/include/Program.h b/include/Program.h index 4ceb880..5bba399 100644 --- a/include/Program.h +++ b/include/Program.h @@ -5,6 +5,8 @@ #include "DolibarrClient.h" #include #include "ServoMotorComponent.h" +#include "NfcReader.h" +#include "GRBL.h" class Program { public: @@ -17,9 +19,14 @@ public: * Program WarehouseGUI loop */ void loop(); + void checkNfc(); + void checkServo(); + void checkWifi(); private: DolibarrClient *client; ServoMotorComponent *servo; + NfcReader *nfcReader; + GRBL *grbl; }; #endif diff --git a/lib/DolibarrClient/src/DolibarrClient.cpp b/lib/DolibarrClient/src/DolibarrClient.cpp index 1a29be1..30b3ef2 100644 --- a/lib/DolibarrClient/src/DolibarrClient.cpp +++ b/lib/DolibarrClient/src/DolibarrClient.cpp @@ -59,23 +59,54 @@ std::vector *DolibarrClient::list_products() const { return nullptr; } +models::Product DolibarrClient::get_product_by_factory_id(const char* factory_id) const { + 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) { + 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()) { + models::Product product; + product.date_creation = obj["date_creation"].as(); + product.id = obj["id"].as(); + product.entity = obj["entity"].as(); + product.stock_reel = obj["stock_reel"].as(); + product.label = obj["label"].as(); + product.accountancy_code_sell = obj["accountancy_code_sell"].as(); + product.accountancy_code_sell_export = obj["accountancy_code_sell_export"].as(); + product.fk_default_warehouse = obj["fk_default_warehouse"].as(); + 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) { - //Serial.println("ERROR: "); - //Serial.println(error.c_str()); delete client; return nullptr; } auto *product = new models::Product(); - product->date_creation = doc["date_creation"]; - product->id = doc["id"]; - product->entity = doc["entity"]; - product->stock_reel = doc["stock_reel"]; - product->label = doc["label"]; + product->date_creation = doc["date_creation"].as(); + product->id = doc["id"].as(); + product->entity = doc["entity"].as(); + product->stock_reel = doc["stock_reel"].as(); + product->label = doc["label"].as(); + product->accountancy_code_sell = doc["accountancy_code_sell"].as(); + product->accountancy_code_sell_export = doc["accountancy_code_sell_export"].as(); delete client; return product; } @@ -108,13 +139,15 @@ std::vector *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); 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) { diff --git a/lib/DolibarrClient/src/DolibarrClient.h b/lib/DolibarrClient/src/DolibarrClient.h index 7579332..748d7aa 100644 --- a/lib/DolibarrClient/src/DolibarrClient.h +++ b/lib/DolibarrClient/src/DolibarrClient.h @@ -24,7 +24,8 @@ public: std::vector *list_warehouse() const; std::vector *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; diff --git a/lib/DolibarrClient/src/DolibarrModels.h b/lib/DolibarrClient/src/DolibarrModels.h index 3e59381..59d0924 100644 --- a/lib/DolibarrClient/src/DolibarrModels.h +++ b/lib/DolibarrClient/src/DolibarrModels.h @@ -4,19 +4,22 @@ namespace models { struct Product { - const char* id; - const char* entity; - const char* ref; - const char* status; - const char* date_creation; - const char* date_modification; - const char* label; - const char* description; - const char* type; - const char* price; - const char* stock_reel; - const char* seuil_stock_alerte; - const char* desiredstock; + std::string id; + std::string entity; + std::string ref; + std::string status; + std::string date_creation; + std::string date_modification; + std::string label; + std::string description; + std::string type; + std::string accountancy_code_sell; + std::string accountancy_code_sell_export; + std::string fk_default_warehouse; + std::string price; + std::string stock_reel; + std::string seuil_stock_alerte; + std::string desiredstock; }; struct ProductStock { @@ -26,9 +29,9 @@ namespace models { }; struct CreateProductStock { - const char* product_id; - const char* warehouse_id; - const char* qty; + std::string product_id; + std::string warehouse_id; + std::string qty; }; struct Warehouse { diff --git a/lib/M5LCD/src/M5LCD.cpp b/lib/M5LCD/src/M5LCD.cpp index 542230f..59096c3 100644 --- a/lib/M5LCD/src/M5LCD.cpp +++ b/lib/M5LCD/src/M5LCD.cpp @@ -5,6 +5,11 @@ */ 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); @@ -83,21 +88,27 @@ void M5LCD::show_dashboard() const { 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.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); } @@ -166,6 +177,33 @@ void M5LCD::update_dashboard() const { } } + +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 */ diff --git a/lib/M5LCD/src/M5LCD.h b/lib/M5LCD/src/M5LCD.h index b49b351..00de43c 100644 --- a/lib/M5LCD/src/M5LCD.h +++ b/lib/M5LCD/src/M5LCD.h @@ -54,6 +54,12 @@ public: 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); private: void update_page() const; void show_debug() const; @@ -66,6 +72,11 @@ private: int _debug_loc_y; std::vector _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; diff --git a/lib/NFC/src/NfcReader.cpp b/lib/NFC/src/NfcReader.cpp index c52af0b..bf7b58f 100644 --- a/lib/NFC/src/NfcReader.cpp +++ b/lib/NFC/src/NfcReader.cpp @@ -22,4 +22,11 @@ String NfcReader::ReadNfc() } } return (this->uid); +} + +bool NfcReader::IsNfcConnected() +{ + Wire.beginTransmission(NFC_ADDR); + byte error = Wire.endTransmission(); + return error == 0; } \ No newline at end of file diff --git a/lib/NFC/src/NfcReader.h b/lib/NFC/src/NfcReader.h index eeb976a..c840262 100644 --- a/lib/NFC/src/NfcReader.h +++ b/lib/NFC/src/NfcReader.h @@ -9,6 +9,7 @@ class NfcReader { public: NfcReader(int i2c_adress); ~NfcReader() = default; + bool IsNfcConnected(); String ReadNfc(); diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp index 950e1c7..2ccc551 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.cpp +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.cpp @@ -56,4 +56,8 @@ void ServoMotorComponent::refresh() { } this->lastUpTime = millis(); this->myservo.write(this->PIN, this->currentPosition); +} + +bool ServoMotorComponent::isConnected() { + return true; } \ No newline at end of file diff --git a/lib/ServoMotorComponent/src/ServoMotorComponent.h b/lib/ServoMotorComponent/src/ServoMotorComponent.h index e493743..0e457a8 100644 --- a/lib/ServoMotorComponent/src/ServoMotorComponent.h +++ b/lib/ServoMotorComponent/src/ServoMotorComponent.h @@ -12,8 +12,9 @@ enum Position { class ServoMotorComponent { public: - ServoMotorComponent(int PIN, unsigned long updatePeriod, float step = 1); + ServoMotorComponent(int PIN, unsigned long updatePeriod = 100, float step = 0.1); void setDesiredPosition(Position desiredPosition); + bool isConnected(); void refresh(); private: diff --git a/lib/WorldTime/src/WorldTime.cpp b/lib/WorldTime/src/WorldTime.cpp new file mode 100644 index 0000000..e8c6c0f --- /dev/null +++ b/lib/WorldTime/src/WorldTime.cpp @@ -0,0 +1 @@ +#include "WorldTime.h" \ No newline at end of file diff --git a/lib/WorldTime/src/WorldTime.h b/lib/WorldTime/src/WorldTime.h new file mode 100644 index 0000000..1a1952f --- /dev/null +++ b/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 \ No newline at end of file diff --git a/src/Program.cpp b/src/Program.cpp index a7bdee7..840665f 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -3,6 +3,12 @@ #include "M5LCD.h" #include "DolibarrClient.h" #include "ServoMotorComponent.h" +#include "NfcReader.h" +#include + +uint32_t derniereExecution = 0; +const uint32_t intervalle = 1000; +std::vector *warehouses; int initialize_wifi(WifiConfig wifi) { lcdScreen->add_log("Connecting to the WiFi network..."); @@ -12,32 +18,43 @@ int initialize_wifi(WifiConfig wifi) { return 0; } -Program::Program() { - Serial.begin(MONITOR_SPEED); - this->servo = new ServoMotorComponent(2, 1, 0.1); - lcdScreen = new M5LCD(); - lcdScreen->add_log("Initialize M5LCD component...."); - struct WifiConfig wifi_c = {WIFI_SSID, WIFI_PASSWORD}; - initialize_wifi(wifi_c); - +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::loop() { - lcdScreen->update(); - this->servo->refresh(); - this->servo->setDesiredPosition(Position::LEFT); +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); - auto *warehouses = this->client->list_warehouse(); + warehouses = this->client->list_warehouse(); if (warehouses != nullptr) { lcdScreen->add_log("Warehouses found !"); lcdScreen->set_dolibarr_status(COMPONENT_OK); - for (auto &a : *warehouses) { + for (auto &ware : *warehouses) { char buffer[50]; - sprintf(buffer, "+ Warehouse '%s' (%s)", a.label.c_str(), a.id.c_str()); + sprintf(buffer, "+ Warehouse '%s' (%s)", ware.label.c_str(), ware.id.c_str()); lcdScreen->add_log(buffer); } } else { @@ -47,9 +64,92 @@ void Program::loop() { } 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->grbl = new GRBL(STEPMOTOR_I2C_ADDR); + Wire.begin(21, 22); + grbl->init(STEPER_SPEED, STEPER_PAS, STEPER_ACC); + struct WifiConfig wifi_c = {WIFI_SSID, WIFI_PASSWORD}; + initialize_wifi(wifi_c); +} +void Program::loop() { + lcdScreen->update(); + + uint32_t maintenant = millis(); + if (maintenant - derniereExecution >= intervalle) { + this->checkServo(); + this->checkNfc(); + this->checkWifi(); + derniereExecution = maintenant; + } + this->servo->refresh(); + + String nfcId = this->nfcReader->ReadNfc(); + //si qqc + if(nfcId != "0"){ + //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 { + //si rien + //je check si le stepper est en iddle + //this->grbl->mouveForward(5); + } + +} \ No newline at end of file From 69db4ba2b7be9495c7e1d9683395ddbfbc7fffd7 Mon Sep 17 00:00:00 2001 From: Nicolas SANS Date: Fri, 26 Jan 2024 09:39:15 +0100 Subject: [PATCH 15/15] Ajout check connexion wifi --- src/Program.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Program.cpp b/src/Program.cpp index 840665f..d9bd918 100644 --- a/src/Program.cpp +++ b/src/Program.cpp @@ -100,6 +100,11 @@ void Program::loop() { 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