|
|
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 |
|
|
|
45cef130ca
|
Ajout de l'algo
|
2024-01-25 14:29:08 +01:00 |
|
|
|
b3ef581d28
|
Merge remote-tracking branch 'origin/develop' into feat/main-algo
|
2024-01-19 12:05:17 +01:00 |
|
|
|
4023cfcb3d
|
NFC: Removing delay function
|
2024-01-19 11:58:13 +01:00 |
|
|
|
4e8e916e5e
|
NFC: Correcting bug & adding in config
|
2024-01-19 11:35:21 +01:00 |
|
|
|
463e71fe10
|
rename nfc reader
|
2024-01-18 21:01:53 +01:00 |
|
|
|
cada4d6e02
|
NFC: Adding NFC Reader
|
2024-01-18 16:57:26 +01:00 |
|
