Browse Source

Modification suite à tests en salle de TP

Sébastien DI MERCURIO 2 years ago
parent
commit
e88b29c036

+ 2
- 1
software/monitor/monitor/gtk-gui/gui.stetic View File

@@ -2,10 +2,11 @@
2 2
 <stetic-interface>
3 3
   <configuration>
4 4
     <images-root-path>..</images-root-path>
5
+    <target-gtk-version>2.12</target-gtk-version>
5 6
   </configuration>
6 7
   <import>
7
-    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
8 8
     <widget-library name="../bin/Debug/monitor.exe" internal="true" />
9
+    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
9 10
   </import>
10 11
   <widget class="Gtk.Window" id="MainWindow" design-size="1025 686">
11 12
     <action-group name="Default">

+ 9
- 19
software/monitor/monitor/monitor.csproj View File

@@ -7,7 +7,7 @@
7 7
     <OutputType>WinExe</OutputType>
8 8
     <RootNamespace>monitor</RootNamespace>
9 9
     <AssemblyName>monitor</AssemblyName>
10
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
10
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11 11
   </PropertyGroup>
12 12
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
13 13
     <DebugSymbols>true</DebugSymbols>
@@ -38,26 +38,16 @@
38 38
   </PropertyGroup>
39 39
   <ItemGroup>
40 40
     <Reference Include="System" />
41
-    <Reference Include="gtk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
42
-      <SpecificVersion>False</SpecificVersion>
43
-    </Reference>
44
-    <Reference Include="gdk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
45
-      <SpecificVersion>False</SpecificVersion>
46
-    </Reference>
47
-    <Reference Include="glib-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
48
-      <SpecificVersion>False</SpecificVersion>
49
-    </Reference>
50
-    <Reference Include="glade-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
51
-      <SpecificVersion>False</SpecificVersion>
52
-    </Reference>
53
-    <Reference Include="pango-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
54
-      <SpecificVersion>False</SpecificVersion>
55
-    </Reference>
56
-    <Reference Include="atk-sharp, Version=2.4.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
57
-      <SpecificVersion>False</SpecificVersion>
58
-    </Reference>
59 41
     <Reference Include="Mono.Posix" />
60 42
     <Reference Include="Mono.Cairo" />
43
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
44
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
45
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
46
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
47
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
48
+    <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
49
+    <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
50
+    <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
61 51
   </ItemGroup>
62 52
   <ItemGroup>
63 53
     <EmbeddedResource Include="gtk-gui\gui.stetic">

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

@@ -4,7 +4,6 @@ cmake-build-debug/
4 4
 futur/
5 5
 CMakeFiles/
6 6
 
7
-Makefile
8 7
 *.cmake
9 8
 CMakeCache.txt
10 9
 

+ 128
- 0
software/raspberry/superviseur-robot/Makefile View File

@@ -0,0 +1,128 @@
1
+#
2
+#  There exist several targets which are by default empty and which can be 
3
+#  used for execution of your targets. These targets are usually executed 
4
+#  before and after some main targets. They are: 
5
+#
6
+#     .build-pre:              called before 'build' target
7
+#     .build-post:             called after 'build' target
8
+#     .clean-pre:              called before 'clean' target
9
+#     .clean-post:             called after 'clean' target
10
+#     .clobber-pre:            called before 'clobber' target
11
+#     .clobber-post:           called after 'clobber' target
12
+#     .all-pre:                called before 'all' target
13
+#     .all-post:               called after 'all' target
14
+#     .help-pre:               called before 'help' target
15
+#     .help-post:              called after 'help' target
16
+#
17
+#  Targets beginning with '.' are not intended to be called on their own.
18
+#
19
+#  Main targets can be executed directly, and they are:
20
+#  
21
+#     build                    build a specific configuration
22
+#     clean                    remove built files from a configuration
23
+#     clobber                  remove all built files
24
+#     all                      build all configurations
25
+#     help                     print help mesage
26
+#  
27
+#  Targets .build-impl, .clean-impl, .clobber-impl, .all-impl, and
28
+#  .help-impl are implemented in nbproject/makefile-impl.mk.
29
+#
30
+#  Available make variables:
31
+#
32
+#     CND_BASEDIR                base directory for relative paths
33
+#     CND_DISTDIR                default top distribution directory (build artifacts)
34
+#     CND_BUILDDIR               default top build directory (object files, ...)
35
+#     CONF                       name of current configuration
36
+#     CND_PLATFORM_${CONF}       platform name (current configuration)
37
+#     CND_ARTIFACT_DIR_${CONF}   directory of build artifact (current configuration)
38
+#     CND_ARTIFACT_NAME_${CONF}  name of build artifact (current configuration)
39
+#     CND_ARTIFACT_PATH_${CONF}  path to build artifact (current configuration)
40
+#     CND_PACKAGE_DIR_${CONF}    directory of package (current configuration)
41
+#     CND_PACKAGE_NAME_${CONF}   name of package (current configuration)
42
+#     CND_PACKAGE_PATH_${CONF}   path to package (current configuration)
43
+#
44
+# NOCDDL
45
+
46
+
47
+# Environment 
48
+MKDIR=mkdir
49
+CP=cp
50
+CCADMIN=CCadmin
51
+
52
+
53
+# build
54
+build: .build-post
55
+
56
+.build-pre:
57
+# Add your pre 'build' code here...
58
+
59
+.build-post: .build-impl
60
+# Add your post 'build' code here...
61
+
62
+
63
+# clean
64
+clean: .clean-post
65
+
66
+.clean-pre:
67
+# Add your pre 'clean' code here...
68
+
69
+.clean-post: .clean-impl
70
+# Add your post 'clean' code here...
71
+
72
+
73
+# clobber
74
+clobber: .clobber-post
75
+
76
+.clobber-pre:
77
+# Add your pre 'clobber' code here...
78
+
79
+.clobber-post: .clobber-impl
80
+# Add your post 'clobber' code here...
81
+
82
+
83
+# all
84
+all: .all-post
85
+
86
+.all-pre:
87
+# Add your pre 'all' code here...
88
+
89
+.all-post: .all-impl
90
+# Add your post 'all' code here...
91
+
92
+
93
+# build tests
94
+build-tests: .build-tests-post
95
+
96
+.build-tests-pre:
97
+# Add your pre 'build-tests' code here...
98
+
99
+.build-tests-post: .build-tests-impl
100
+# Add your post 'build-tests' code here...
101
+
102
+
103
+# run tests
104
+test: .test-post
105
+
106
+.test-pre: build-tests
107
+# Add your pre 'test' code here...
108
+
109
+.test-post: .test-impl
110
+# Add your post 'test' code here...
111
+
112
+
113
+# help
114
+help: .help-post
115
+
116
+.help-pre:
117
+# Add your pre 'help' code here...
118
+
119
+.help-post: .help-impl
120
+# Add your post 'help' code here...
121
+
122
+
123
+
124
+# include project implementation makefile
125
+include nbproject/Makefile-impl.mk
126
+
127
+# include project make variables
128
+include nbproject/Makefile-variables.mk

Loading…
Cancel
Save