Browse Source

reorganisation du repertoire superviseur-robot + passage à Cmake

Sébastien DI MERCURIO 3 years ago
parent
commit
6bf2742136
40 changed files with 33 additions and 473 deletions
  1. 2
    5
      software/raspberry/superviseur-robot/.gitignore
  2. 13
    0
      software/raspberry/superviseur-robot/CMakeLists.txt
  3. 0
    7
      software/raspberry/superviseur-robot/Essai_VSC/CMakeLists.txt
  4. 0
    91
      software/raspberry/superviseur-robot/Essai_VSC/main.cpp
  5. 0
    145
      software/raspberry/superviseur-robot/example/.cproject
  6. 0
    2
      software/raspberry/superviseur-robot/example/.gitignore
  7. 0
    0
      software/raspberry/superviseur-robot/example/.gitignores
  8. 0
    27
      software/raspberry/superviseur-robot/example/.project
  9. 0
    25
      software/raspberry/superviseur-robot/example/.settings/language.settings.xml
  10. 0
    7
      software/raspberry/superviseur-robot/example/CMakeLists.txt
  11. 0
    1
      software/raspberry/superviseur-robot/example/lib
  12. 0
    28
      software/raspberry/superviseur-robot/example/serialTest/lib/subdir.mk
  13. 0
    56
      software/raspberry/superviseur-robot/example/serialTest/makefile
  14. 0
    8
      software/raspberry/superviseur-robot/example/serialTest/objects.mk
  15. 0
    28
      software/raspberry/superviseur-robot/example/serialTest/sources.mk
  16. 0
    22
      software/raspberry/superviseur-robot/example/serialTest/src/subdir.mk
  17. 0
    21
      software/raspberry/superviseur-robot/example/src/Makefile
  18. 1
    0
      software/raspberry/superviseur-robot/examples/.gitignore
  19. 11
    0
      software/raspberry/superviseur-robot/examples/CMakeLists.txt
  20. 0
    0
      software/raspberry/superviseur-robot/examples/src/rtvideoExample.cpp
  21. 0
    0
      software/raspberry/superviseur-robot/examples/src/serialExample.cpp
  22. 0
    0
      software/raspberry/superviseur-robot/examples/src/serialTest.cpp
  23. 0
    0
      software/raspberry/superviseur-robot/examples/src/serverTest.cpp
  24. 0
    0
      software/raspberry/superviseur-robot/examples/src/uiExample.cpp
  25. 0
    0
      software/raspberry/superviseur-robot/examples/src/videoExample.cpp
  26. 1
    0
      software/raspberry/superviseur-robot/lib/.gitignore
  27. 5
    0
      software/raspberry/superviseur-robot/lib/CMakeLists.txt
  28. 0
    0
      software/raspberry/superviseur-robot/lib/Robot.h
  29. 0
    0
      software/raspberry/superviseur-robot/lib/Serial.h
  30. 0
    0
      software/raspberry/superviseur-robot/lib/TcpServer.h
  31. 0
    0
      software/raspberry/superviseur-robot/lib/definitions.h
  32. 0
    0
      software/raspberry/superviseur-robot/lib/image.h
  33. 0
    0
      software/raspberry/superviseur-robot/lib/message.h
  34. 0
    0
      software/raspberry/superviseur-robot/lib/monitor.h
  35. 0
    0
      software/raspberry/superviseur-robot/lib/src/Robot.cpp
  36. 0
    0
      software/raspberry/superviseur-robot/lib/src/Serial.cpp
  37. 0
    0
      software/raspberry/superviseur-robot/lib/src/TcpServer.cpp
  38. 0
    0
      software/raspberry/superviseur-robot/lib/src/image.cpp
  39. 0
    0
      software/raspberry/superviseur-robot/lib/src/message.cpp
  40. 0
    0
      software/raspberry/superviseur-robot/lib/src/monitor.cpp

+ 2
- 5
software/raspberry/superviseur-robot/.gitignore View File

@@ -1,5 +1,2 @@
1
-/.cproject
2
-/.project
3
-/Debug/
4
-/Release/
5
-/.settings/
1
+build/
2
+src.sav/

+ 13
- 0
software/raspberry/superviseur-robot/CMakeLists.txt View File

@@ -0,0 +1,13 @@
1
+cmake_minimum_required(VERSION 3.9)
2
+project(ProjDestjil CXX)
3
+
4
+set (ProjDestjil_VERSION_MAJOR 1)
5
+set (ProjDestjil_VERSION_MINOR 0)
6
+set (CMAKE_CXX_STANDARD 11)
7
+
8
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../lib)
9
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../lib)
10
+
11
+add_subdirectory("lib")
12
+add_subdirectory("examples")
13
+#add_subdirectory("destjil_init")

+ 0
- 7
software/raspberry/superviseur-robot/Essai_VSC/CMakeLists.txt View File

@@ -1,7 +0,0 @@
1
-cmake_minimum_required(VERSION 3.9)
2
-project(stress)
3
-
4
-set(CMAKE_CXX_STANDARD 11)
5
-
6
-set(SOURCE_FILES main.cpp ../src/robot.cpp ../src/robot.h)
7
-add_executable(stress ${SOURCE_FILES})

+ 0
- 91
software/raspberry/superviseur-robot/Essai_VSC/main.cpp View File

@@ -1,91 +0,0 @@
1
-#include <iostream>
2
-#include "../src/definitions.h"
3
-#include "../src/robot.h"
4
-#include <ctime>
5
-
6
-#define NB_TEST 50
7
-#define NB_RETRIES_MAX 5
8
-#define DELAY_BETWEEN_RETRIES 10000 // 10 ms
9
-#define DELAY_BETWEEN_TEST 1000000 // 1 seconde
10
-
11
-int nb_retries;
12
-int nb_test;
13
-
14
-int laststatus;
15
-int nb_success;
16
-int nb_timeout;
17
-int nb_unknown_cmd;
18
-
19
-int flipflop;
20
-
21
-int main() {
22
-    if (open_communication_robot() != 0) {
23
-        std::cout << "Unable to open com port" << std::endl;
24
-
25
-        return -1;
26
-    }
27
-
28
-    std::cout << "Debut du test de stress" << std::endl;
29
-    time_t t_debut, t_fin;
30
-    struct tm *tm_debut, *tm_fin;
31
-
32
-    time(&t_debut);
33
-    tm_debut = (struct tm*)malloc (sizeof(struct tm));
34
-    tm_debut = localtime((const time_t*)&t_debut);
35
-
36
-    std::cout << "[heure debut]: " << asctime(tm_debut) << std::endl;
37
-
38
-    nb_retries=-1;
39
-    do {
40
-        usleep(DELAY_BETWEEN_RETRIES);
41
-        nb_retries++;
42
-        laststatus = send_command_to_robot(DMB_START_WITHOUT_WD);
43
-    } while ((nb_retries<NB_RETRIES_MAX) && (laststatus != 0));
44
-
45
-    if(nb_retries == NB_RETRIES_MAX) {
46
-        std::cout << "Unable to start robot" <<std::endl;
47
-
48
-        return -1;
49
-    }
50
-
51
-    nb_success =0;
52
-    nb_timeout =0;
53
-    nb_unknown_cmd =0;
54
-    flipflop = 0;
55
-
56
-    for (nb_test=0; nb_test < NB_TEST; nb_test++) {
57
-        nb_retries=-1;
58
-
59
-        do {
60
-            usleep(DELAY_BETWEEN_RETRIES);
61
-            nb_retries++;
62
-            if (flipflop == 0) {
63
-                laststatus = send_command_to_robot(DMB_TURN, "100");
64
-            } else {
65
-                laststatus = send_command_to_robot(DMB_TURN, "-100");
66
-            }
67
-
68
-        } while ((nb_retries<NB_RETRIES_MAX) && (laststatus != 0));
69
-
70
-        if (flipflop ==0) flipflop=1;
71
-        else flipflop =0;
72
-
73
-        if (laststatus == 0) nb_success++;
74
-        else if (laststatus == ROBOT_TIMED_OUT) nb_timeout++;
75
-        else if (laststatus == ROBOT_UKNOWN_CMD) nb_unknown_cmd ++;
76
-
77
-        std::cout << "Test " << nb_test << " [s " << nb_success
78
-                  << ": t " << nb_timeout << ": u " << nb_unknown_cmd
79
-                  << "]"<< "\x1B" <<"[30D"<<std::flush;
80
-
81
-        usleep(DELAY_BETWEEN_TEST);
82
-    }
83
-
84
-    time(&t_fin);
85
-    tm_fin = (struct tm*)malloc (sizeof(struct tm));
86
-    tm_fin = localtime((const time_t*)&t_fin);
87
-
88
-    std::cout << std::endl << std::endl << "[heure fin]: " << asctime(tm_fin) << std::endl;
89
-
90
-    return 0;
91
-}

+ 0
- 145
software/raspberry/superviseur-robot/example/.cproject View File

@@ -1,145 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
3
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
4
-		<cconfiguration id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908">
5
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908" moduleId="org.eclipse.cdt.core.settings" name="serialTest">
6
-				<externalSettings/>
7
-				<extensions>
8
-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
9
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
10
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
11
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
12
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
13
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
14
-				</extensions>
15
-			</storageModule>
16
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
17
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="Test RF quality" id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908" name="serialTest" parent="com.atollic.managedbuild.pctools.config.gnu.exe.debug">
18
-					<folderInfo id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908." name="/" resourcePath="">
19
-						<toolChain id="com.atollic.managedbuild.pctoolschain.gnu.exe.debug.1644719303" name="Atollic Linux PC Tools" superClass="com.atollic.managedbuild.pctoolschain.gnu.exe.debug">
20
-							<targetPlatform id="com.atollic.pctools.managedbuild.target.gnu.platform.exe.debug.444948895" name="Debug Platform" superClass="com.atollic.pctools.managedbuild.target.gnu.platform.exe.debug"/>
21
-							<builder buildPath="${workspace_loc:/Dumber-Robot-Exemple}/Debug" customBuilderProperties="toolChainpathType=1|toolChainpathString=/opt/Atollic_TrueSTUDIO_for_STM32_x86_64_9.0.0/ARMTools/bin|" id="com.atollic.pctools.managedbuild.target.gnu.builder.exe.debug.703691933" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make Builder" superClass="com.atollic.pctools.managedbuild.target.gnu.builder.exe.debug"/>
22
-							<tool id="com.atollic.managedbuild.pctools.gnu.archiver.base.754185313" name="Archiver" superClass="com.atollic.managedbuild.pctools.gnu.archiver.base"/>
23
-							<tool id="com.atollic.managedbuild.pctools.gnu.cpp.compiler.exe.debug.460714726" name="C++ Compiler" superClass="com.atollic.managedbuild.pctools.gnu.cpp.compiler.exe.debug">
24
-								<option id="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.optimization.level.759860919" name="Optimization Level" superClass="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="com.atollic.pctools.gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
25
-								<option id="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.debugging.level.1134609705" name="Debug Level" superClass="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="com.atollic.pctools.gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
26
-								<option id="com.atollic.pctools.gnu.cpp.compiler.option.include.paths.1092205484" name="Include paths (-I)" superClass="com.atollic.pctools.gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
27
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lib}&quot;"/>
28
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
29
-								</option>
30
-								<inputType id="com.atollic.managedbuild.pctools.gnu.cpp.compiler.input.18466674" superClass="com.atollic.managedbuild.pctools.gnu.cpp.compiler.input"/>
31
-							</tool>
32
-							<tool id="com.atollic.managedbuild.pctools.gnu.c.compiler.exe.debug.1524457175" name="C Compiler" superClass="com.atollic.managedbuild.pctools.gnu.c.compiler.exe.debug">
33
-								<option defaultValue="com.atollic.pctools.gnu.c.optimization.level.none" id="com.atollic.pctools.gnu.c.compiler.exe.debug.option.optimization.level.602619486" name="Optimization Level" superClass="com.atollic.pctools.gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
34
-								<option id="com.atollic.pctools.gnu.c.compiler.exe.debug.option.debugging.level.1202784327" name="Debug Level" superClass="com.atollic.pctools.gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="com.atollic.pctools.gnu.c.debugging.level.max" valueType="enumerated"/>
35
-								<option id="com.atollic.pctools.gnu.c.compiler.option.include.paths.608880272" name="Include paths (-I)" superClass="com.atollic.pctools.gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
36
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lib}&quot;"/>
37
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
38
-								</option>
39
-								<inputType id="com.atollic.managedbuild.pctools.gnu.c.compiler.input.978460249" superClass="com.atollic.managedbuild.pctools.gnu.c.compiler.input"/>
40
-							</tool>
41
-							<tool id="com.atollic.managedbuild.pctools.gnu.c.linker.exe.debug.650018959" name="C Linker" superClass="com.atollic.managedbuild.pctools.gnu.c.linker.exe.debug"/>
42
-							<tool id="com.atollic.managedbuild.pctools.gnu.cpp.linker.exe.debug.949894658" name="C++ Linker" superClass="com.atollic.managedbuild.pctools.gnu.cpp.linker.exe.debug">
43
-								<inputType id="com.atollic.managedbuild.pctools.gnu.cpp.linker.input.520817887" superClass="com.atollic.managedbuild.pctools.gnu.cpp.linker.input">
44
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
45
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
46
-								</inputType>
47
-							</tool>
48
-							<tool id="com.atollic.managedbuild.pctools.gnu.assembler.exe.debug.1090002007" name="Assembler" superClass="com.atollic.managedbuild.pctools.gnu.assembler.exe.debug">
49
-								<inputType id="com.atollic.managedbuild.pctools.gnu.assembler.input.665455269" superClass="com.atollic.managedbuild.pctools.gnu.assembler.input"/>
50
-							</tool>
51
-						</toolChain>
52
-					</folderInfo>
53
-					<fileInfo id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.107079152" name="image.h" rcbsApplicability="disable" resourcePath="lib/image.h" toolsToInvoke=""/>
54
-					<fileInfo id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.2136136082" name="Makefile" rcbsApplicability="disable" resourcePath="src/Makefile" toolsToInvoke=""/>
55
-					<sourceEntries>
56
-						<entry excluding="monitor.cpp|image.h|image.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="lib"/>
57
-						<entry excluding="Makefile|videoExample.cpp|uiExample.cpp|serialExample.cpp|rtvideoExample.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
58
-					</sourceEntries>
59
-				</configuration>
60
-			</storageModule>
61
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
62
-		</cconfiguration>
63
-		<cconfiguration id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.1158593353">
64
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.1158593353" moduleId="org.eclipse.cdt.core.settings" name="Server test">
65
-				<externalSettings/>
66
-				<extensions>
67
-					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>
68
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
69
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
70
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
71
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
72
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
73
-				</extensions>
74
-			</storageModule>
75
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
76
-				<configuration artifactName="ServerTest" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="Test server setup" id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.1158593353" name="Server test" parent="com.atollic.managedbuild.pctools.config.gnu.exe.debug">
77
-					<folderInfo id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.1158593353." name="/" resourcePath="">
78
-						<toolChain id="com.atollic.managedbuild.pctoolschain.gnu.exe.debug.1769978487" name="Atollic Linux PC Tools" superClass="com.atollic.managedbuild.pctoolschain.gnu.exe.debug">
79
-							<targetPlatform id="com.atollic.pctools.managedbuild.target.gnu.platform.exe.debug.1135891617" name="Debug Platform" superClass="com.atollic.pctools.managedbuild.target.gnu.platform.exe.debug"/>
80
-							<builder buildPath="${workspace_loc:/Dumber-Robot-Exemple}/Debug" customBuilderProperties="toolChainpathType=1|toolChainpathString=/opt/Atollic_TrueSTUDIO_for_STM32_x86_64_9.0.0/ARMTools/bin|" id="com.atollic.pctools.managedbuild.target.gnu.builder.exe.debug.1461439116" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make Builder" superClass="com.atollic.pctools.managedbuild.target.gnu.builder.exe.debug"/>
81
-							<tool id="com.atollic.managedbuild.pctools.gnu.archiver.base.1426655308" name="Archiver" superClass="com.atollic.managedbuild.pctools.gnu.archiver.base"/>
82
-							<tool id="com.atollic.managedbuild.pctools.gnu.cpp.compiler.exe.debug.115182827" name="C++ Compiler" superClass="com.atollic.managedbuild.pctools.gnu.cpp.compiler.exe.debug">
83
-								<option id="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.optimization.level.1103169709" name="Optimization Level" superClass="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="com.atollic.pctools.gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
84
-								<option id="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.debugging.level.1900144654" name="Debug Level" superClass="com.atollic.pctools.gnu.cpp.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="com.atollic.pctools.gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
85
-								<option id="com.atollic.pctools.gnu.cpp.compiler.option.include.paths.2096629070" name="Include paths (-I)" superClass="com.atollic.pctools.gnu.cpp.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
86
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lib}&quot;"/>
87
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
88
-								</option>
89
-								<inputType id="com.atollic.managedbuild.pctools.gnu.cpp.compiler.input.928183158" superClass="com.atollic.managedbuild.pctools.gnu.cpp.compiler.input"/>
90
-							</tool>
91
-							<tool id="com.atollic.managedbuild.pctools.gnu.c.compiler.exe.debug.1435027661" name="C Compiler" superClass="com.atollic.managedbuild.pctools.gnu.c.compiler.exe.debug">
92
-								<option defaultValue="com.atollic.pctools.gnu.c.optimization.level.none" id="com.atollic.pctools.gnu.c.compiler.exe.debug.option.optimization.level.169974575" name="Optimization Level" superClass="com.atollic.pctools.gnu.c.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
93
-								<option id="com.atollic.pctools.gnu.c.compiler.exe.debug.option.debugging.level.980419679" name="Debug Level" superClass="com.atollic.pctools.gnu.c.compiler.exe.debug.option.debugging.level" useByScannerDiscovery="false" value="com.atollic.pctools.gnu.c.debugging.level.max" valueType="enumerated"/>
94
-								<option id="com.atollic.pctools.gnu.c.compiler.option.include.paths.967863685" name="Include paths (-I)" superClass="com.atollic.pctools.gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
95
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/lib}&quot;"/>
96
-									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>
97
-								</option>
98
-								<inputType id="com.atollic.managedbuild.pctools.gnu.c.compiler.input.1991549921" superClass="com.atollic.managedbuild.pctools.gnu.c.compiler.input"/>
99
-							</tool>
100
-							<tool id="com.atollic.managedbuild.pctools.gnu.c.linker.exe.debug.1530079011" name="C Linker" superClass="com.atollic.managedbuild.pctools.gnu.c.linker.exe.debug"/>
101
-							<tool id="com.atollic.managedbuild.pctools.gnu.cpp.linker.exe.debug.1993338495" name="C++ Linker" superClass="com.atollic.managedbuild.pctools.gnu.cpp.linker.exe.debug">
102
-								<inputType id="com.atollic.managedbuild.pctools.gnu.cpp.linker.input.774293629" superClass="com.atollic.managedbuild.pctools.gnu.cpp.linker.input">
103
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
104
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
105
-								</inputType>
106
-							</tool>
107
-							<tool id="com.atollic.managedbuild.pctools.gnu.assembler.exe.debug.210875902" name="Assembler" superClass="com.atollic.managedbuild.pctools.gnu.assembler.exe.debug">
108
-								<inputType id="com.atollic.managedbuild.pctools.gnu.assembler.input.61333264" superClass="com.atollic.managedbuild.pctools.gnu.assembler.input"/>
109
-							</tool>
110
-						</toolChain>
111
-					</folderInfo>
112
-					<fileInfo id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.1158593353.lib/image.h" name="image.h" rcbsApplicability="disable" resourcePath="lib/image.h" toolsToInvoke=""/>
113
-					<fileInfo id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.1158593353.src/Makefile" name="Makefile" rcbsApplicability="disable" resourcePath="src/Makefile" toolsToInvoke=""/>
114
-					<sourceEntries>
115
-						<entry excluding="monitor.cpp|image.h|image.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="lib"/>
116
-						<entry excluding="serialTest.cpp|Makefile|videoExample.cpp|uiExample.cpp|serialExample.cpp|rtvideoExample.cpp" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
117
-					</sourceEntries>
118
-				</configuration>
119
-			</storageModule>
120
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
121
-		</cconfiguration>
122
-	</storageModule>
123
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
124
-		<project id="Dumber-Robot-Exemple.com.atollic.pctools.managedbuild.target.gnu.exe.162302072" name="Executable" projectType="com.atollic.pctools.managedbuild.target.gnu.exe"/>
125
-	</storageModule>
126
-	<storageModule moduleId="scannerConfiguration">
127
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
128
-	</storageModule>
129
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
130
-	<storageModule moduleId="refreshScope" versionNumber="2">
131
-		<configuration configurationName="Server test">
132
-			<resource resourceType="PROJECT" workspacePath="/Dumber-Robot-Exemple"/>
133
-		</configuration>
134
-		<configuration configurationName="serialTest">
135
-			<resource resourceType="PROJECT" workspacePath="/Dumber-Robot-Exemple"/>
136
-		</configuration>
137
-		<configuration configurationName="Debug">
138
-			<resource resourceType="PROJECT" workspacePath="/Dumber-Robot-Exemple"/>
139
-		</configuration>
140
-		<configuration configurationName="Release">
141
-			<resource resourceType="PROJECT" workspacePath="/Dumber-Robot-Exemple"/>
142
-		</configuration>
143
-	</storageModule>
144
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
145
-</cproject>

+ 0
- 2
software/raspberry/superviseur-robot/example/.gitignore View File

@@ -1,2 +0,0 @@
1
-/Debug/
2
-/Server test/

+ 0
- 0
software/raspberry/superviseur-robot/example/.gitignores View File


+ 0
- 27
software/raspberry/superviseur-robot/example/.project View File

@@ -1,27 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<projectDescription>
3
-	<name>Dumber-Robot-Exemple</name>
4
-	<comment></comment>
5
-	<projects>
6
-	</projects>
7
-	<buildSpec>
8
-		<buildCommand>
9
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
10
-			<triggers>clean,full,incremental,</triggers>
11
-			<arguments>
12
-			</arguments>
13
-		</buildCommand>
14
-		<buildCommand>
15
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
16
-			<triggers>full,incremental,</triggers>
17
-			<arguments>
18
-			</arguments>
19
-		</buildCommand>
20
-	</buildSpec>
21
-	<natures>
22
-		<nature>org.eclipse.cdt.core.cnature</nature>
23
-		<nature>org.eclipse.cdt.core.ccnature</nature>
24
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
25
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
26
-	</natures>
27
-</projectDescription>

+ 0
- 25
software/raspberry/superviseur-robot/example/.settings/language.settings.xml View File

@@ -1,25 +0,0 @@
1
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
-<project>
3
-	<configuration id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908" name="serialTest">
4
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
5
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
6
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
7
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
8
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="205429042390110507" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
9
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
10
-				<language-scope id="org.eclipse.cdt.core.g++"/>
11
-			</provider>
12
-		</extension>
13
-	</configuration>
14
-	<configuration id="com.atollic.managedbuild.pctools.config.gnu.exe.debug.119910908.1158593353" name="Server test">
15
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
16
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
17
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
18
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
19
-			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="205429042390110507" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
20
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
21
-				<language-scope id="org.eclipse.cdt.core.g++"/>
22
-			</provider>
23
-		</extension>
24
-	</configuration>
25
-</project>

+ 0
- 7
software/raspberry/superviseur-robot/example/CMakeLists.txt View File

@@ -1,7 +0,0 @@
1
-cmake_minimum_required(VERSION 3.9)
2
-project(stress)
3
-
4
-set(CMAKE_CXX_STANDARD 11)
5
-
6
-set(SOURCE_FILES main.cpp ../../src/robot.cpp ../../src/robot.h)
7
-add_executable(stress ${SOURCE_FILES})

+ 0
- 1
software/raspberry/superviseur-robot/example/lib View File

@@ -1 +0,0 @@
1
-../src/

+ 0
- 28
software/raspberry/superviseur-robot/example/serialTest/lib/subdir.mk View File

@@ -1,28 +0,0 @@
1
-################################################################################
2
-# Automatically-generated file. Do not edit!
3
-################################################################################
4
-
5
-# Add inputs and outputs from these tool invocations to the build variables 
6
-CPP_SRCS += \
7
-../lib/Robot.cpp \
8
-../lib/Serial.cpp \
9
-../lib/TcpServer.cpp \
10
-../lib/message.cpp 
11
-
12
-OBJS += \
13
-./lib/Robot.o \
14
-./lib/Serial.o \
15
-./lib/TcpServer.o \
16
-./lib/message.o 
17
-
18
-CPP_DEPS += \
19
-./lib/Robot.d \
20
-./lib/Serial.d \
21
-./lib/TcpServer.d \
22
-./lib/message.d 
23
-
24
-
25
-# Each subdirectory must supply rules for building sources it contributes
26
-lib/%.o: ../lib/%.cpp
27
-	g++ -I"/home/dimercur/Documents/Travail/git/dumber/software/raspberry/superviseur-robot/example/lib" -I"/home/dimercur/Documents/Travail/git/dumber/software/raspberry/superviseur-robot/example/src" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
28
-

+ 0
- 56
software/raspberry/superviseur-robot/example/serialTest/makefile View File

@@ -1,56 +0,0 @@
1
-################################################################################
2
-# Automatically-generated file. Do not edit!
3
-################################################################################
4
-
5
--include ../makefile.init
6
-
7
-RM := rm -rf
8
-
9
-# All of the sources participating in the build are defined here
10
--include sources.mk
11
--include src/subdir.mk
12
--include lib/subdir.mk
13
--include subdir.mk
14
--include objects.mk
15
-
16
-ifneq ($(MAKECMDGOALS),clean)
17
-ifneq ($(strip $(CC_DEPS)),)
18
--include $(CC_DEPS)
19
-endif
20
-ifneq ($(strip $(C++_DEPS)),)
21
--include $(C++_DEPS)
22
-endif
23
-ifneq ($(strip $(C_UPPER_DEPS)),)
24
--include $(C_UPPER_DEPS)
25
-endif
26
-ifneq ($(strip $(CXX_DEPS)),)
27
--include $(CXX_DEPS)
28
-endif
29
-ifneq ($(strip $(CPP_DEPS)),)
30
--include $(CPP_DEPS)
31
-endif
32
-ifneq ($(strip $(C_DEPS)),)
33
--include $(C_DEPS)
34
-endif
35
-endif
36
-
37
--include ../makefile.defs
38
-
39
-# Add inputs and outputs from these tool invocations to the build variables 
40
-
41
-# All Target
42
-all: Dumber-Robot-Exemple
43
-
44
-# Tool invocations
45
-Dumber-Robot-Exemple: $(OBJS) $(USER_OBJS)
46
-	g++  -o "Dumber-Robot-Exemple" $(OBJS) $(USER_OBJS) $(LIBS)
47
-
48
-# Other Targets
49
-clean:
50
-	-$(RM) $(CC_DEPS)$(C++_DEPS)$(EXECUTABLES)$(C_UPPER_DEPS)$(CXX_DEPS)$(OBJS)$(CPP_DEPS)$(C_DEPS) Dumber-Robot-Exemple
51
-	-@echo ' '
52
-
53
-.PHONY: all clean dependents
54
-.SECONDARY:
55
-
56
--include ../makefile.targets

+ 0
- 8
software/raspberry/superviseur-robot/example/serialTest/objects.mk View File

@@ -1,8 +0,0 @@
1
-################################################################################
2
-# Automatically-generated file. Do not edit!
3
-################################################################################
4
-
5
-USER_OBJS :=
6
-
7
-LIBS :=
8
-

+ 0
- 28
software/raspberry/superviseur-robot/example/serialTest/sources.mk View File

@@ -1,28 +0,0 @@
1
-################################################################################
2
-# Automatically-generated file. Do not edit!
3
-################################################################################
4
-
5
-C_UPPER_SRCS := 
6
-CXX_SRCS := 
7
-C++_SRCS := 
8
-OBJ_SRCS := 
9
-CC_SRCS := 
10
-ASM_SRCS := 
11
-CPP_SRCS := 
12
-C_SRCS := 
13
-O_SRCS := 
14
-S_UPPER_SRCS := 
15
-CC_DEPS := 
16
-C++_DEPS := 
17
-EXECUTABLES := 
18
-C_UPPER_DEPS := 
19
-CXX_DEPS := 
20
-OBJS := 
21
-CPP_DEPS := 
22
-C_DEPS := 
23
-
24
-# Every subdirectory with source files must be described here
25
-SUBDIRS := \
26
-lib \
27
-src \
28
-

+ 0
- 22
software/raspberry/superviseur-robot/example/serialTest/src/subdir.mk View File

@@ -1,22 +0,0 @@
1
-################################################################################
2
-# Automatically-generated file. Do not edit!
3
-################################################################################
4
-
5
-# Add inputs and outputs from these tool invocations to the build variables 
6
-CPP_SRCS += \
7
-../src/serialTest.cpp \
8
-../src/serverTest.cpp 
9
-
10
-OBJS += \
11
-./src/serialTest.o \
12
-./src/serverTest.o 
13
-
14
-CPP_DEPS += \
15
-./src/serialTest.d \
16
-./src/serverTest.d 
17
-
18
-
19
-# Each subdirectory must supply rules for building sources it contributes
20
-src/%.o: ../src/%.cpp
21
-	g++ -I"/home/dimercur/Documents/Travail/git/dumber/software/raspberry/superviseur-robot/example/lib" -I"/home/dimercur/Documents/Travail/git/dumber/software/raspberry/superviseur-robot/example/src" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)" -o "$@" "$<"
22
-

+ 0
- 21
software/raspberry/superviseur-robot/example/src/Makefile View File

@@ -1,21 +0,0 @@
1
-LDFLAGS= -L/opt/vc/lib  -I/usr/local/include -lopencv_highgui -lopencv_core   -lopencv_imgcodecs -lraspicam_cv -lopencv_imgproc -lpthread
2
-
3
-all :
4
-	make serial
5
-	make video
6
-	make ui
7
-	make rt
8
-
9
-serial :
10
-	g++ serialExample.cpp -o serialExample.elf  ../obj/serial.o
11
-video :
12
-	g++ videoExample.cpp -o videoExample.elf ../obj/serial.o ../obj/imagerie.o ../obj/tcpServer.o $(LDFLAGS)
13
-
14
-ui :
15
-	g++ uiExample.cpp -o uiExample.elf ../obj/serial.o ../obj/imagerie.o ../obj/tcpServer.o $(LDFLAGS)
16
-
17
-rt :
18
-	g++ -o rtvideoExample.elf rtvideoExample.cpp -I/usr/xenomai/include/mercury -I/usr/xenomai/include -D_GNU_SOURCE -D_REENTRANT -D__MERCURY__ -I/usr/xenomai/include/alchemy ../obj/serial.o ../obj/imagerie.o ../obj/tcpServer.o -lalchemy  -lcopperplate /usr/xenomai/lib/xenomai/bootstrap.o -Wl,--wrap=main -Wl,--dynamic-list=/usr/xenomai/lib/dynlist.ld -L/usr/xenomai/lib -lmercury -lpthread -lrt    -Wl,-R/usr/xenomai/lib  -L/opt/vc/lib  -I/usr/local/include -lopencv_highgui -lopencv_core -lopencv_imgcodecs -lraspicam_cv -lopencv_imgproc
19
-
20
-clean : 
21
-	rm *.elf

+ 1
- 0
software/raspberry/superviseur-robot/examples/.gitignore View File

@@ -0,0 +1 @@
1
+bin/

+ 11
- 0
software/raspberry/superviseur-robot/examples/CMakeLists.txt View File

@@ -0,0 +1,11 @@
1
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/../examples/bin)
2
+
3
+set(serialTest_FILES ./src/serialTest.cpp)
4
+set(serverTest_FILES ./src/serverTest.cpp)
5
+include_directories(./src ../lib)
6
+
7
+add_executable(serialTest ${serialTest_FILES})
8
+target_link_libraries(serialTest destjil)
9
+
10
+add_executable(serverTest ${serverTest_FILES})
11
+target_link_libraries(serverTest destjil)

software/raspberry/superviseur-robot/example/src/rtvideoExample.cpp → software/raspberry/superviseur-robot/examples/src/rtvideoExample.cpp View File


software/raspberry/superviseur-robot/example/src/serialExample.cpp → software/raspberry/superviseur-robot/examples/src/serialExample.cpp View File


software/raspberry/superviseur-robot/example/src/serialTest.cpp → software/raspberry/superviseur-robot/examples/src/serialTest.cpp View File


software/raspberry/superviseur-robot/example/src/serverTest.cpp → software/raspberry/superviseur-robot/examples/src/serverTest.cpp View File


software/raspberry/superviseur-robot/example/src/uiExample.cpp → software/raspberry/superviseur-robot/examples/src/uiExample.cpp View File


software/raspberry/superviseur-robot/example/src/videoExample.cpp → software/raspberry/superviseur-robot/examples/src/videoExample.cpp View File


+ 1
- 0
software/raspberry/superviseur-robot/lib/.gitignore View File

@@ -0,0 +1 @@
1
+libdestjil.a

+ 5
- 0
software/raspberry/superviseur-robot/lib/CMakeLists.txt View File

@@ -0,0 +1,5 @@
1
+set(LIB_FILES ./src/Serial.cpp ./src/Robot.cpp ./src/TcpServer.cpp)
2
+include_directories("./")
3
+
4
+add_library(destjil STATIC ${LIB_FILES})
5
+

software/raspberry/superviseur-robot/src/Robot.h → software/raspberry/superviseur-robot/lib/Robot.h View File


software/raspberry/superviseur-robot/src/Serial.h → software/raspberry/superviseur-robot/lib/Serial.h View File


software/raspberry/superviseur-robot/src/TcpServer.h → software/raspberry/superviseur-robot/lib/TcpServer.h View File


software/raspberry/superviseur-robot/src/definitions.h → software/raspberry/superviseur-robot/lib/definitions.h View File


software/raspberry/superviseur-robot/src/image.h → software/raspberry/superviseur-robot/lib/image.h View File


software/raspberry/superviseur-robot/src/message.h → software/raspberry/superviseur-robot/lib/message.h View File


software/raspberry/superviseur-robot/src/monitor.h → software/raspberry/superviseur-robot/lib/monitor.h View File


software/raspberry/superviseur-robot/src/Robot.cpp → software/raspberry/superviseur-robot/lib/src/Robot.cpp View File


software/raspberry/superviseur-robot/src/Serial.cpp → software/raspberry/superviseur-robot/lib/src/Serial.cpp View File


software/raspberry/superviseur-robot/src/TcpServer.cpp → software/raspberry/superviseur-robot/lib/src/TcpServer.cpp View File


software/raspberry/superviseur-robot/src/image.cpp → software/raspberry/superviseur-robot/lib/src/image.cpp View File


software/raspberry/superviseur-robot/src/message.cpp → software/raspberry/superviseur-robot/lib/src/message.cpp View File


software/raspberry/superviseur-robot/src/monitor.cpp → software/raspberry/superviseur-robot/lib/src/monitor.cpp View File


Loading…
Cancel
Save