feat:V1.0 #8

Merged
Clement merged 58 commits from develop into master 2024-02-02 16:03:25 +00:00
2 changed files with 9 additions and 5 deletions
Showing only changes of commit 3f77acd600 - Show all commits

View File

@ -22,7 +22,7 @@ build_flags =
-D STEPER_ACC=200
;-D STEPER_PAS=755.906 ; = 65mm
-D STEPER_PAS=58 ; = 5mm
-D STEPER_SPEED=1000 ; 12000
-D STEPER_SPEED=2700 ;1000 ; 2500
;;;;;;;;;;;;;;;;;;;;;;
;;; App config ;;;
;;;;;;;;;;;;;;;;;;;;;;
@ -33,7 +33,10 @@ build_flags =
;;;;;;;;;;;;;;;;;;;;;;
;;; Servo config ;;;
;;;;;;;;;;;;;;;;;;;;;;
-D RIGHT_POS=18
-D MIDDLE_POS=32
-D RIGHT_POS=14 ;18
-D MIDDLE_POS=30 ;32
-D LEFT_POS=52
-D CONVOYER_LEN=150 ;mm
-D CONVOYER_LEN=80 ;mm

View File

@ -78,6 +78,7 @@ Program::Program() {
lcdScreen->add_log("Initialize M5LCD component....");
this->nfcReader = new NfcReader(NFC_ADDR);
this->servo = new ServoMotorComponent(2, 1, 1);
this->servo->setDesiredPosition(Position::MIDDLE);
this->grbl = new GRBL(STEPMOTOR_I2C_ADDR);
Wire.begin(21, 22);
grbl->init(STEPER_SPEED, STEPER_PAS, STEPER_ACC);
@ -156,4 +157,4 @@ void Program::loop() {
this->grbl->mouveForward(5);
}
}
}
}