|
|
da2a06b23a
|
speedup servo little bit
|
2024-02-09 10:56:19 +01:00 |
|
|
|
1d1874872b
|
Merge branch 'master' into develop
|
2024-02-09 08:58:02 +01:00 |
|
|
|
2d32523317
|
fuck u
|
2024-02-09 08:57:25 +01:00 |
|
|
|
adc6134d8b
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# config.ini
# src/Program.cpp
|
2024-02-09 08:32:54 +01:00 |
|
|
|
d2dec55110
|
Rework de la lib dolibarr
|
2024-02-09 08:31:10 +01:00 |
|
|
|
c270a764f2
|
Merge pull request 'patch' (#22) from develop into master
Reviewed-on: #22
|
2024-02-02 17:10:54 +01:00 |
|
|
|
26b1185bca
|
Merge pull request 'fuc j'ai ouvlier un truc' (#21) from feat/output-reader into develop
Reviewed-on: #21
|
2024-02-02 17:10:31 +01:00 |
|
|
|
627509a2d7
|
fuc j'ai ouvlier un truc
|
2024-02-02 17:07:16 +01:00 |
|
|
|
01728a2499
|
Merge pull request 'feat:V1.0' (#8) from develop into master
Reviewed-on: #8
|
2024-02-02 17:03:23 +01:00 |
|
|
|
57cf250a03
|
Merge pull request 'feat/output-reader' (#20) from feat/output-reader into develop
Reviewed-on: #20
Reviewed-by: Nicolas <nicolas.sansd@gmail.com>
|
2024-02-02 16:43:13 +01:00 |
|
|
|
9c11f62019
|
add timer for stepper
|
2024-02-02 14:39:50 +01:00 |
|
|
|
7b975bd9a9
|
add to mutch colis error
|
2024-02-01 15:38:04 +01:00 |
|
|
|
35ecce7d5d
|
sync
|
2024-02-01 11:53:19 +01:00 |
|
|
|
a105387c21
|
add nfc reader lib
|
2024-02-01 11:28:03 +01:00 |
|
|
|
3f77acd600
|
feat: 2nd in site test
|
2024-01-26 11:35:26 +01:00 |
|
|
|
23258e2682
|
Merge pull request 'feat: main-algo' (#16) from feat/main-algo into develop
Reviewed-on: #16
Reviewed-by: Nicolas <nicolas.sansd@gmail.com>
|
2024-01-26 09:47:25 +01:00 |
|
|
|
f64264631e
|
Merge branch 'develop' of ssh://git.lab-ouest.org:8022/Epitech/T-IOT-901_convoyor into feat/main-algo
# Conflicts:
# config.ini
# include/Program.h
# lib/NFC/src/NfcReader.cpp
# src/Program.cpp
|
2024-01-26 09:46:49 +01:00 |
|
|
|
68a4ab9755
|
Merge pull request 'feat/m5_lcd' (#19) from feat/m5_lcd into develop
Reviewed-on: #19
|
2024-01-26 09:40:59 +01:00 |
|
|
|
69db4ba2b7
|
Ajout check connexion wifi
|
2024-01-26 09:39:15 +01:00 |
|
|
|
45cef130ca
|
Ajout de l'algo
|
2024-01-25 14:29:08 +01:00 |
|
|
|
2c22e0a538
|
Merge remote-tracking branch 'origin/develop' into feat/m5_lcd
# Conflicts:
# config.ini
# src/Program.cpp
|
2024-01-19 16:48:08 +01:00 |
|
|
|
c498489cbb
|
Merge pull request 'feature/servo_motor_component' (#17) from feature/servo_motor_component into develop
Reviewed-on: #17
Reviewed-by: Nicolas <nicolas.sansd@gmail.com>
|
2024-01-19 16:46:00 +01:00 |
|
|
|
c3e50c79b5
|
Rebase develop
|
2024-01-19 16:43:37 +01:00 |
|
|
|
fe671182cd
|
add config.ini
|
2024-01-19 16:40:31 +01:00 |
|
|
|
4f3a5bda03
|
Création du composant LCD, rajout des écrans de logs et du dashboard
|
2024-01-19 16:40:28 +01:00 |
|
|
|
15bd7c7741
|
Retour Clement
|
2024-01-19 16:40:15 +01:00 |
|
|
|
dea01d3e84
|
Refacto servoMotor
|
2024-01-19 16:40:15 +01:00 |
|
|
|
9a8a84a59e
|
[ServoMotor] - rework servoMotor for adding speed and easing for movement
|
2024-01-19 16:40:15 +01:00 |
|
|
|
027015b33b
|
[feature/ServoMotor] - change servo librarie
|
2024-01-19 16:40:15 +01:00 |
|
|
|
f3dc069f3b
|
[feature/Servo_Motor] - add ServoMotorComponent
|
2024-01-19 16:39:44 +01:00 |
|
|
|
1e59d9dc46
|
add config.ini
|
2024-01-19 16:37:35 +01:00 |
|
|
|
b3ef581d28
|
Merge remote-tracking branch 'origin/develop' into feat/main-algo
|
2024-01-19 12:05:17 +01:00 |
|
|
|
6e9a59bb00
|
Merge pull request 'feat: nfc-reader' (#15) from feat/nfc-reader into develop
Reviewed-on: #15
|
2024-01-19 12:01:17 +01:00 |
|
|
|
4023cfcb3d
|
NFC: Removing delay function
|
2024-01-19 11:58:13 +01:00 |
|
|
|
0e14688f85
|
Merge branch 'develop' into feat/nfc-reader
|
2024-01-19 11:54:23 +01:00 |
|
|
|
032960c168
|
fix: Addr config
|
2024-01-19 11:51:59 +01:00 |
|
|
|
81c9ececf6
|
Retour Clement
|
2024-01-19 11:35:25 +01:00 |
|
|
|
4e8e916e5e
|
NFC: Correcting bug & adding in config
|
2024-01-19 11:35:21 +01:00 |
|
|
|
a66882e877
|
Refacto servoMotor
|
2024-01-19 09:48:21 +01:00 |
|
|
|
29c41b6ccc
|
add some affichage idea
|
2024-01-18 21:06:14 +01:00 |
|
|
|
04474bfb94
|
add main algo V1 with mock
|
2024-01-18 21:02:11 +01:00 |
|
|
|
463e71fe10
|
rename nfc reader
|
2024-01-18 21:01:53 +01:00 |
|
|
|
76ebc00763
|
add is idle condition on RGBL lib
|
2024-01-18 21:01:02 +01:00 |
|
|
|
8bdd4a9be2
|
add convoyer len and nfc i2C addr
|
2024-01-18 21:00:36 +01:00 |
|
|
|
f947fc7e5f
|
Merge remote-tracking branch 'origin/feat/nfc-reader' into feat/main-algo
|
2024-01-18 19:53:23 +01:00 |
|
|
|
b96088c4eb
|
cleanup
|
2024-01-18 19:32:02 +01:00 |
|
|
|
d8f0bb07be
|
add idée d'algo
|
2024-01-18 19:16:23 +01:00 |
|
|
|
cada4d6e02
|
NFC: Adding NFC Reader
|
2024-01-18 16:57:26 +01:00 |
|
|
|
b7fe429508
|
Merge pull request 'feat: GRBL-stepper-motor' (#14) from feat/GRBL-stepper into develop
Reviewed-on: #14
|
2024-01-18 15:46:25 +01:00 |
|
|
|
fe529b4f57
|
reset main to initial state
|
2024-01-18 15:43:04 +01:00 |
|
