This commit is contained in:
Clement 2024-02-09 08:57:25 +01:00
parent c270a764f2
commit 2d32523317
5 changed files with 33 additions and 22 deletions

View File

@ -22,7 +22,7 @@ build_flags =
-D STEPER_ACC=200 -D STEPER_ACC=200
;-D STEPER_PAS=755.906 ; = 65mm ;-D STEPER_PAS=755.906 ; = 65mm
-D STEPER_PAS=58 ; = 5mm -D STEPER_PAS=58 ; = 5mm
-D STEPER_SPEED=2700 ;1000 ; 2500 -D STEPER_SPEED=2000 ;1000 ; 2500
-D GRBL_UPDATE=165 ;update time in ms -D GRBL_UPDATE=165 ;update time in ms
;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;
;;; App config ;;; ;;; App config ;;;
@ -40,4 +40,4 @@ build_flags =
-D CONVOYER_LEN=80 ;mm -D CONVOYER_LEN=70 ; 80 ;mm

View File

@ -0,0 +1,23 @@
@startuml algo
!pragma useVerticalIf on
start
:teste périphérique;
:gestion bourrage colis;
if (NFC détecter) then (oui)
:j'affiche le tag lu;
:je récupère le produit sur Dolibarr;
:gestion erreur;
:je crée un mouvement de stock Dolibarr;
:gestion erreur;
:je bouge l'aiguillage de destination;
:j'avance de la longueur du tapis;
else (non)
:avance tapis;
endif
stop
@enduml

View File

@ -8,18 +8,6 @@ class Dolibarr {
+ String createStockMovement(String tagID, String warehouseId) + String createStockMovement(String tagID, String warehouseId)
} }
package "Managers" {
abstract AManager {
# ILCDScreen lcd
# IServoMotor servo
# IGRBL grbl
# INFCReader nfc
}
class WarehouseManager
WarehouseManager .|> AManager
}
package "Components" { package "Components" {
package "NFCReader" { package "NFCReader" {
@ -66,12 +54,11 @@ class Program {
+ void loop + void loop
} }
AManager <-- IServoMotor Program <-- IServoMotor
AManager <-- IGRBL Program <-- IGRBL
AManager <-- ILCDScreen Program <-- ILCDScreen
AManager <-- INFCReader Program <-- INFCReader
Program <-- WarehouseManager Dolibarr --> Program
Program <-- Dolibarr
@enduml @enduml

View File

@ -173,6 +173,7 @@ void M5LCD::set_dolibarr_status(AvailableComponentsStatus status) {
void M5LCD::update_dashboard() const { void M5LCD::update_dashboard() const {
if (this->_current_page == DASHBOARD_SCREEN) { if (this->_current_page == DASHBOARD_SCREEN) {
M5.Lcd.clear();
this->show_dashboard(); this->show_dashboard();
} }
} }

View File

@ -164,8 +164,8 @@ void Program::loop() {
} }
this->grbl->mouveForward(CONVOYER_LEN); this->grbl->mouveForward(CONVOYER_LEN);
} else { } else {
if((this->grbl->isIddle() || (maintenant - this->grblUpdateTime >= GRBL_UPDATE)) && lcdScreen->get_components().grbl == COMPONENT_OK){ if((this->grbl->isIddle()) && lcdScreen->get_components().grbl == COMPONENT_OK){
this->grblUpdateTime = maintenant; //this->grblUpdateTime = maintenant;
this->grbl->mouveForward(5); this->grbl->mouveForward(5);
} }
} }