erreur de dossier pour can-messages.txt et gitignore de binaires

7Robot · Mar 1, 2012 · 0a77f0b · 0a77f0b
1 parent 6daa81e
commit 0a77f0b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 67 deletions.
diff --git a/can/can-messages.txt b/can/can-messages.txt
diff --git a/can/libcan/can-messages.txt b/can/libcan/can-messages.txt
@@ -1,7 +1,4 @@
-1151	resetAsserv
-639	resetOdo
-383	resetCapteur
-255	resetTourelle
+127	globalReset
 513	odoReq
 514	odoMute
 515	odoUnmute
@@ -14,9 +11,9 @@
 1151	asservStop
 1030	asservOn
 1031	asservOff
-1032	asserSpeedRampe
-132	tourelleMini
-133	tourelleFull
+1032	asserRamp
+132	tourelleReq
+133	tourelleData
 134	tourelleMute
 135	tourelleUnmute
 136	tourelleOff
@@ -41,4 +38,22 @@
 257	bumpBack1
 258	bumpFront0
 259	bumpFront1
-
+272	sharp4Dist
+274	sharp5Dist
+276	sharp6Dist
+278	sharp7Dist
+304	sharp4Req
+306	sharp5Req
+308	sharp6Req
+310	sharp7Req
+312	sharp4Mute
+313	sharp4Unmute
+314	sharp5Mute
+315	sharp5Unmute
+316	sharp6Mute
+317	sharp6Unmute
+318	sharp7Mute
+319	sharp7Unmute
+260	killSwitch0
+261	killSwitch1
+64	suiveurValues
diff --git a/gui/.gitignore b/gui/.gitignore
@@ -0,0 +1,3 @@
+QT_Eurobot2012
+Ordre_QT/Ordre_QT
+
diff --git a/gui/QT_Eurobot2012 b/gui/QT_Eurobot2012