Commit graph

78 commits

Author SHA1 Message Date
d4e6ba4042 Changement format commentaires 2021-03-03 08:34:12 +01:00
cff9e149b6 Conversion vers syntaxe cpp 2021-03-03 08:29:43 +01:00
d18621f6eb Possibilité de désactiver opencv4 avec cmake 2021-03-03 08:13:05 +01:00
5f99ea9f0e Migration vers OpenCV4 2021-03-02 19:09:24 +01:00
34c4234942 Uncomment raspicam related lines 2021-03-02 18:46:35 +01:00
1bdadaa50f Add preprocessor definition for simulation 2021-03-02 18:39:32 +01:00
188683847a update min cmake version 2021-03-02 18:04:27 +01:00
ee82ecf59c config xenomai shared libraries folder in cmake 2021-03-02 18:02:04 +01:00
dd4f0b418c fix typo in INCLUDE_DIRS 2021-03-02 17:43:01 +01:00
7c3c63e032 Correction du cmake et tentative de build
Toujours impossible de trouver alchemy depuis tasks.h
2021-03-02 11:39:35 +01:00
f9ad5f6562 Merge branch 'cmake' into simulation-cmake 2021-03-02 10:05:49 +01:00
463c7d3fa9 modification du makefile pour utiliser opencv4 2021-03-02 10:00:24 +01:00
b74dff66fc Switch to cmake build system 2021-03-01 17:48:42 +01:00
pehladik
588ba2ecc9 localhost by default, reconnexion ok, panel control ok 2020-04-17 14:54:27 +02:00
pehladik
57158cfaa7 Revert "localhost by default, reconnexion available, the panel control is not activated if the robot is not start"
This reverts commit f98343aca4.
2020-04-17 14:30:48 +02:00
pehladik
f98343aca4 localhost by default, reconnexion available, the panel control is not activated if the robot is not start 2020-04-17 14:25:19 +02:00
pehladik
1d2df7017d add open(string host, int port) 2020-04-06 17:42:28 +02:00
pehladik
de1629c147 add carriage return for robot communication with the simulator 2020-04-05 16:03:16 +02:00
pehladik
1c73c39715 fix close 2020-03-30 17:10:56 +02:00
pehladik
a87b0ffc69 keep supervisor alive if robot is killed 2020-03-30 15:37:42 +02:00
pehladik
89a2bae5c0 update simulator with watchdog, ping, reset, poweroff and relaod commands 2020-03-19 15:27:25 +01:00
pehladik
7f0a9955db simulateur: ajout temps de réponse et erreur, comrobot : ajout msgAnswer adequat a la reponse 2020-03-14 23:41:27 +01:00
pehladik
a7eaa150df add robot simulator 2020-03-14 02:49:03 +01:00
PE Hladik
a3fc2d8815 ajout configuration plugin c/c++ netbeans 2020-02-23 17:57:57 +01:00
pehladik
d18b368266
Merge pull request #3 from d-a-v/conception_typo
conception_robot: typos
2019-05-20 10:48:33 +02:00
pehladik
39501c4c63
Merge pull request #4 from d-a-v/guidecompilation
guide compilation: typos
2019-05-20 10:48:06 +02:00
david gauchard
9a4c4917e0 typos 2019-05-07 16:51:10 +02:00
david gauchard
181d03c553 typos 2019-05-07 16:42:14 +02:00
Sébastien DI MERCURIO
6d3307f1f3 merge de la branche dev du repertoire software/monitor/monitor 2019-04-11 13:03:05 +02:00
Sébastien DI MERCURIO
e44af5cddc Re-merge depuis la branche dev du repertoire software/raspberry/superviseur-robot qui n'etait pas à jour 2019-04-11 12:29:21 +02:00
Sébastien DI MERCURIO
491fae55d5 Merge superviseur/robot depuis la branche dev 2019-04-11 12:25:35 +02:00
Sébastien DI MERCURIO
34be2bb151 Merge branch 'master' of https://github.com/INSA-GEI/dumber 2019-04-11 11:13:48 +02:00
Sébastien DI MERCURIO
0ac343ee95 Merge branch 'dev' of https://github.com/INSA-GEI/dumber 2019-04-11 11:13:24 +02:00
PE Hladik
b6c6143584 correction sujets 2019-04-11 10:22:51 +02:00
pehladik
ac01c1f50a
Merge pull request #1 from Terae/patch-1
Typo
2019-04-11 10:01:04 +02:00
pehladik
cc84086479 update lib 2019-04-11 08:46:48 +02:00
Benjamin BIGEY
ebc25adc63
Typo 2019-04-01 13:56:53 +02:00
Sébastien DI MERCURIO
ea3b47cdac Merge branch 'dev' of https://github.com/INSA-GEI/dumber 2019-03-17 21:21:25 +01:00
pehladik
4934190959
Delete .DS_Store 2019-03-05 15:44:47 +01:00
pehladik
2f0706a689
Delete .DS_Store 2019-03-05 15:44:30 +01:00
pehladik
51f345c952
Delete .DS_Store 2019-03-05 15:44:16 +01:00
PE Hladik
6db2a525a2 ajout rapport étudiant 2019-03-05 15:39:56 +01:00
Sébastien DI MERCURIO
8869c15df1 Oubli de fichier 2019-02-11 14:13:03 +01:00
Sébastien DI MERCURIO
6ff5a468f6 RC1 pour TP 2019 2019-02-11 14:09:42 +01:00
PE Hladik
38f3f57f4e mise a jour guide et code 2019-02-11 10:35:15 +01:00
PE Hladik
ccd5adedfe mise a jour specification 2019-02-11 09:21:01 +01:00
PE Hladik
68ef76587e mise a jour dossie de conception 2019-02-11 09:07:24 +01:00
pehladik
c38909f5cc projet init 2019-02-08 17:06:17 +01:00
Sébastien DI MERCURIO
8b283de4db Merge branch 'dev' of https://github.com/INSA-GEI/dumber into dev 2019-01-23 16:43:46 +01:00
Sébastien DI MERCURIO
e88b29c036 Modification suite à tests en salle de TP 2019-01-23 16:43:15 +01:00