From 2451177ccd99fd29d802b98c120bcf2c9cde2049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20DI=20MERCURIO?= Date: Fri, 19 Oct 2018 10:53:20 +0200 Subject: [PATCH] Last commit to branch master. after that next commits will be in branch dev or stable --- .../raspberry/superviseur-robot/.gitignore | 9 + .../raspberry/superviseur-robot/.idea/.name | 1 + .../.idea/codeStyles/Project.xml | 29 + .../superviseur-robot/.idea/misc.xml | 7 + .../superviseur-robot/.idea/modules.xml | 8 + .../.idea/superviseur-robot.iml | 2 + .../raspberry/superviseur-robot/.idea/vcs.xml | 6 + .../superviseur-robot/.idea/workspace.xml | 864 ++++++++++++++++++ .../superviseur-robot/CMakeLists.txt | 22 +- .../superviseur-robot/ProjDestijl.cbp | 142 +++ .../superviseur-robot/compile_commands.json | 32 + .../superviseur-robot/destijl_init/Makefile | 36 - .../superviseur-robot/examples/CMakeLists.txt | 8 +- .../superviseur-robot/lib/.gitignore | 5 + .../superviseur-robot/lib/CMakeLists.txt | 4 +- .../raspberry/superviseur-robot/lib/Robot.h | 84 -- .../raspberry/superviseur-robot/lib/Serial.h | 49 - .../superviseur-robot/lib/TcpServer.h | 35 - .../superviseur-robot/lib/definitions.h | 24 + .../raspberry/superviseur-robot/lib/image.h | 2 + .../raspberry/superviseur-robot/lib/monitor.h | 2 +- .../raspberry/superviseur-robot/lib/robot.h | 64 ++ .../superviseur-robot/lib/src/Robot.cpp | 349 ------- .../superviseur-robot/lib/src/Serial.cpp | 164 ---- .../superviseur-robot/lib/src/TcpServer.cpp | 93 -- .../superviseur-robot/lib/src/message.cpp | 2 +- .../superviseur-robot/lib/src/monitor.cpp | 2 +- .../superviseur-robot/lib/src/robot.cpp | 236 +++++ .../nbproject/configurations.xml | 116 +++ .../superviseur-robot/nbproject/project.xml | 26 + .../superviseur-pthread/CMakeLists.txt | 9 + .../superviseur-pthread/bin/monitor | Bin 0 -> 49552 bytes .../bin/superviseur-pthread | Bin 0 -> 228344 bytes .../superviseur-pthread/src/Program.cpp | 273 ++++++ .../superviseur-pthread/src/Tasks.cpp | 246 +++++ .../superviseur-pthread/src/Tasks.h | 44 + .../superviseur-robot/superviseur/.gitignore | 9 + .../superviseur/CMakeLists.txt | 15 + .../src/functions.cpp | 6 +- .../header => superviseur/src}/functions.h | 10 +- .../src}/main.cpp | 17 +- 41 files changed, 2211 insertions(+), 841 deletions(-) create mode 100644 software/raspberry/superviseur-robot/.idea/.name create mode 100644 software/raspberry/superviseur-robot/.idea/codeStyles/Project.xml create mode 100644 software/raspberry/superviseur-robot/.idea/misc.xml create mode 100644 software/raspberry/superviseur-robot/.idea/modules.xml create mode 100644 software/raspberry/superviseur-robot/.idea/superviseur-robot.iml create mode 100644 software/raspberry/superviseur-robot/.idea/vcs.xml create mode 100644 software/raspberry/superviseur-robot/.idea/workspace.xml create mode 100644 software/raspberry/superviseur-robot/ProjDestijl.cbp create mode 100644 software/raspberry/superviseur-robot/compile_commands.json delete mode 100644 software/raspberry/superviseur-robot/destijl_init/Makefile delete mode 100644 software/raspberry/superviseur-robot/lib/Robot.h delete mode 100644 software/raspberry/superviseur-robot/lib/Serial.h delete mode 100644 software/raspberry/superviseur-robot/lib/TcpServer.h create mode 100644 software/raspberry/superviseur-robot/lib/robot.h delete mode 100644 software/raspberry/superviseur-robot/lib/src/Robot.cpp delete mode 100644 software/raspberry/superviseur-robot/lib/src/Serial.cpp delete mode 100644 software/raspberry/superviseur-robot/lib/src/TcpServer.cpp create mode 100644 software/raspberry/superviseur-robot/lib/src/robot.cpp create mode 100644 software/raspberry/superviseur-robot/nbproject/configurations.xml create mode 100644 software/raspberry/superviseur-robot/nbproject/project.xml create mode 100644 software/raspberry/superviseur-robot/superviseur-pthread/CMakeLists.txt create mode 100755 software/raspberry/superviseur-robot/superviseur-pthread/bin/monitor create mode 100755 software/raspberry/superviseur-robot/superviseur-pthread/bin/superviseur-pthread create mode 100644 software/raspberry/superviseur-robot/superviseur-pthread/src/Program.cpp create mode 100644 software/raspberry/superviseur-robot/superviseur-pthread/src/Tasks.cpp create mode 100644 software/raspberry/superviseur-robot/superviseur-pthread/src/Tasks.h create mode 100644 software/raspberry/superviseur-robot/superviseur/.gitignore create mode 100644 software/raspberry/superviseur-robot/superviseur/CMakeLists.txt rename software/raspberry/superviseur-robot/{destijl_init => superviseur}/src/functions.cpp (98%) rename software/raspberry/superviseur-robot/{destijl_init/header => superviseur/src}/functions.h (90%) rename software/raspberry/superviseur-robot/{destijl_init => superviseur/src}/main.cpp (91%) diff --git a/software/raspberry/superviseur-robot/.gitignore b/software/raspberry/superviseur-robot/.gitignore index 8826514..8ba92f7 100644 --- a/software/raspberry/superviseur-robot/.gitignore +++ b/software/raspberry/superviseur-robot/.gitignore @@ -1,2 +1,11 @@ build/ src.sav/ +cmake-build-debug/ +futur/ +build/ +CMakeFiles/ + +Makefile +*.cmake +CMakeCache.txt + diff --git a/software/raspberry/superviseur-robot/.idea/.name b/software/raspberry/superviseur-robot/.idea/.name new file mode 100644 index 0000000..02eef87 --- /dev/null +++ b/software/raspberry/superviseur-robot/.idea/.name @@ -0,0 +1 @@ +ProjDestijl \ No newline at end of file diff --git a/software/raspberry/superviseur-robot/.idea/codeStyles/Project.xml b/software/raspberry/superviseur-robot/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/software/raspberry/superviseur-robot/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/software/raspberry/superviseur-robot/.idea/misc.xml b/software/raspberry/superviseur-robot/.idea/misc.xml new file mode 100644 index 0000000..8822db8 --- /dev/null +++ b/software/raspberry/superviseur-robot/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/software/raspberry/superviseur-robot/.idea/modules.xml b/software/raspberry/superviseur-robot/.idea/modules.xml new file mode 100644 index 0000000..7a92ef3 --- /dev/null +++ b/software/raspberry/superviseur-robot/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/software/raspberry/superviseur-robot/.idea/superviseur-robot.iml b/software/raspberry/superviseur-robot/.idea/superviseur-robot.iml new file mode 100644 index 0000000..f08604b --- /dev/null +++ b/software/raspberry/superviseur-robot/.idea/superviseur-robot.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/software/raspberry/superviseur-robot/.idea/vcs.xml b/software/raspberry/superviseur-robot/.idea/vcs.xml new file mode 100644 index 0000000..c2365ab --- /dev/null +++ b/software/raspberry/superviseur-robot/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/software/raspberry/superviseur-robot/.idea/workspace.xml b/software/raspberry/superviseur-robot/.idea/workspace.xml new file mode 100644 index 0000000..2579f0f --- /dev/null +++ b/software/raspberry/superviseur-robot/.idea/workspace.xml @@ -0,0 +1,864 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +