68 Commits

Author SHA1 Message Date
b26a27dc5b Merge pull request 'feat: intégration DHT capteur (humi,temp)' (#26) from feat/DHT-11-humi-dans-temp-capteur into master
Reviewed-on: Epitech-T-DEV-811/T-DEV-811#26
Reviewed-by: nico <nicolas.sansd@gmail.com>
Reviewed-by: MDeghaud <michel.deghaud@epitech.eu>
2023-05-02 11:51:56 +02:00
fa6662e885 fix and comment 2023-05-02 11:51:39 +02:00
a47ec78e1c Merge branch 'master' into feat/DHT-11-humi-dans-temp-capteur 2023-05-02 11:46:37 +02:00
17b344732f Merge pull request 'feat: Test_IOT' (#40) from feat/Test_IOT into master
Reviewed-on: Epitech-T-DEV-811/T-DEV-811#40
Reviewed-by: nico <nicolas.sansd@gmail.com>
Reviewed-by: Clement <clement@jo85.com>
2023-04-25 10:54:13 +02:00
Mathis
9b0b5bedd8 feat: add doc for secret 2023-04-24 16:52:08 +02:00
Mathis
e088b4e304 Fix: remove useless file 2023-04-24 16:49:54 +02:00
Mathis
b3da67f31e feat: Add end to end test for ultrasonic capteur 2023-04-24 16:05:50 +02:00
Mathis
884169e745 feat: add Test for sendValue 2023-04-24 15:49:16 +02:00
Mathis
36bdb86343 feat: Add Test for Connect API 2023-04-24 14:54:26 +02:00
Mathis
5784e38fbb feat: add Test for WifiConnect API 2023-04-24 12:22:52 +02:00
Mathis
9811022b76 Create Branche Test_IOT 2023-04-24 11:17:36 +02:00
a150d1c17f Merge pull request 'add cppcheck config' (#39) from feat--cppcheck into master
Reviewed-on: Epitech-T-DEV-811/T-DEV-811#39
2023-04-24 11:00:25 +02:00
96ebd89dd3 add cppcheck config 2023-04-24 10:59:32 +02:00
370a16441b Merge pull request 'feat: capteur-ultrason' (#27) from feat--capteur-ultrason into master
Reviewed-on: Epitech-T-DEV-811/T-DEV-811#27
Reviewed-by: 5OLE1L <mathis.ragot@epitech.eu>
Reviewed-by: nico <nicolas.sansd@gmail.com>
2023-04-24 10:47:13 +02:00
71a07cc552 Merge pull request 'feat/AR_Architecture' (#37) from feat/AR_Architecture into master
Reviewed-on: Epitech-T-DEV-811/T-DEV-811#37
Reviewed-by: 5OLE1L <mathis.ragot@epitech.eu>
Reviewed-by: Clement <clement@jo85.com>
2023-04-24 09:54:04 +02:00
b1787886c6 Merge branch 'master' into feat/AR_Architecture 2023-04-24 09:53:37 +02:00
Nicolas SANS
75018ee6cd edited README.md 2023-04-18 16:10:44 +02:00
Nicolas SANS
782af8c90d edited git attributes file 2023-04-18 15:52:22 +02:00
Nicolas SANS
ac5cb75407 Migrating to Vuforia, Adding multitarget system 2023-04-18 15:40:00 +02:00
8928ab9922 Merge pull request 'feat/AR_Architecture' (#33) from feat/AR_Architecture into master
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/33
Reviewed-by: Clement <clement@jo85.com>
2023-04-11 16:09:36 +02:00
Nicolas SANS
38824485c0 Merge remote-tracking branch 'origin/master' into feat/AR_Architecture
# Conflicts:
#	.gitignore
2023-04-11 14:08:54 +02:00
9a77d3163f Merge pull request 'docs: Doxy-API-et-diagramme-API' (#25) from docs/Doxy-API-et-diagramme-API into master
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/25
Reviewed-by: nico <nicolas.sansd@gmail.com>
Reviewed-by: Guska <gildas.gonzalez@epitech.eu>
2023-04-11 13:53:42 +02:00
Nicolas SANS
c092e3d426 Adding trash api values when scanning a specific marker 2023-04-11 13:47:42 +02:00
Nicolas SANS
af5acdae96 Adding env.example file and env unity plugin 2023-04-11 08:53:41 +02:00
978ce41fcf Merge pull request 'feat/trash_marker' (#29) from feat/trash_marker into feat/AR_Architecture
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/29
2023-04-11 10:39:24 +02:00
Nicolas SANS
13b0bdcfb0 adding basic scene with marker detection 2023-04-11 07:57:25 +02:00
7b5d4a071b feat: add ultrasonic sensor and exemple 2023-04-04 15:37:55 +02:00
2e4b24df10 feat: untra son config 2023-04-04 14:36:45 +02:00
b1728b0509 feat: intégration DHT capteur DHT11_test 2023-04-04 11:22:24 +02:00
b921edd04b typo 2023-04-04 10:57:46 +02:00
62651ca606 docs(iot): create diagram class 2023-04-04 10:56:27 +02:00
aba69c8181 fix: doc and typo 2023-04-04 10:55:39 +02:00
ab94d9fbf3 fix: typo 2023-04-04 10:45:44 +02:00
70f18faee5 feat: doxyfile 2023-04-04 10:41:45 +02:00
a6abcd4fe1 Merge pull request 'feat(IOT): LibAPI' (#21) from feat/LibAPI into master
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/21
Reviewed-by: nico <nicolas.sansd@gmail.com>
2023-04-03 16:55:12 +02:00
4bde578c35 update config 2023-04-03 16:30:44 +02:00
60bb2911f4 remove(iot): test in main programme 2023-04-03 16:30:34 +02:00
97ae6c6977 docs(iot): documentation de la lib api client 2023-04-03 16:23:59 +02:00
789cab74a9 refactor(iot): change type of connect on api 2023-04-03 16:19:32 +02:00
59728b9694 feat(iot): API Client OK 2023-04-03 16:07:57 +02:00
7861cfae51 feat: connection OK 2023-04-03 12:06:39 +02:00
3208c2ff6b feat(WIP): test main API lib 2023-04-03 11:10:12 +02:00
89ecb3bf17 feat: commentaire 2023-04-03 11:09:44 +02:00
c57225c1f3 feat(iot): connection wifi and API *UNTESTED* 2023-03-28 17:28:55 +02:00
98e0342fe1 feat(iot): constructeur API 2023-03-28 16:05:36 +02:00
bcfe0a07f8 Merge pull request 'feat: CAO link in readme' (#22) from clement-patch-1 into master
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/22
2023-03-28 07:39:17 +00:00
ad524cfc68 feat: CAO link in readme 2023-03-28 07:38:39 +00:00
e8ebe48128 feat: init api lib 2023-03-27 17:42:17 +02:00
31dfa751a3 feat: add deps 2023-03-27 17:41:53 +02:00
e56b92aa7b Merge pull request 'docs/diagram-API' (#10) from docs/diagram-API into master
Reviewed-on: https://gitea.cb85.software/Epitech-T-DEV-811/T-DEV-811/pulls/10
Reviewed-by: MDeghaud <michel.deghaud@epitech.eu>
Reviewed-by: nico <nicolas.sansd@gmail.com>
2023-03-21 11:03:46 +00:00