Menu
▾
▴
[Krobot-commits] [SCM] krobot branch, master, updated. 182605606955fdaa815cce416d69a3780ffd9280
|
From: Olivier B. <Ba...@us...> - 2010-01-30 17:11:32
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "krobot".
The branch, master has been updated
via 182605606955fdaa815cce416d69a3780ffd9280 (commit)
via 320ef0c22a0792bfd3dc15aaf8eab9b0e63c82b4 (commit)
via 9f50ac99d7c16555b36012b36868a1da631145ba (commit)
from aa454675ff1f8c9a040ffbb6bf8d67edc1296e6f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 182605606955fdaa815cce416d69a3780ffd9280
Author: Olivier BICHLER <oli...@gm...>
Date: Sat Jan 30 18:10:39 2010 +0100
Ajout des cartes AX12 Interface et Robot Interface + plusieurs optimisations dans le design du bras pour la saisie des épis et le guidage des tomates
commit 320ef0c22a0792bfd3dc15aaf8eab9b0e63c82b4
Merge: 9f50ac99d7c16555b36012b36868a1da631145ba aa454675ff1f8c9a040ffbb6bf8d67edc1296e6f
Author: Olivier BICHLER <oli...@gm...>
Date: Sat Jan 30 18:09:21 2010 +0100
Merge branch 'master' of ssh://krobot.git.sourceforge.net/gitroot/krobot/krobot
commit 9f50ac99d7c16555b36012b36868a1da631145ba
Author: Olivier BICHLER <oli...@gm...>
Date: Sat Jan 30 11:48:16 2010 +0100
Suppression des fichiers de projet CodeBlocks, inutiles
-----------------------------------------------------------------------
Changes:
diff --git a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.cbp b/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.cbp
deleted file mode 100644
index 7c3a101..0000000
--- a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.cbp
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
- <FileVersion major="1" minor="6" />
- <Project>
- <Option title="USB_Com_Layer" />
- <Option pch_mode="2" />
- <Option compiler="gcc" />
- <Build>
- <Target title="Release">
- <Option output="bin\Release\libUSB_Com_Layer" prefix_auto="1" extension_auto="1" />
- <Option object_output="obj\Release\" />
- <Option type="3" />
- <Option compiler="gcc" />
- <Option createDefFile="1" />
- <Option createStaticLib="1" />
- <Compiler>
- <Add option="-O2" />
- <Add option="-Wmain" />
- <Add option="-W" />
- <Add option="-Wall" />
- <Add directory="..\..\..\..\Python26\include" />
- </Compiler>
- <Linker>
- <Add option="-s" />
- <Add library="..\..\..\..\MinGW\lib\libsetupapi.a" />
- <Add library="..\..\..\..\Python26\libs\libpython30.a" />
- </Linker>
- </Target>
- </Build>
- <Compiler>
- <Add option="-Wmain" />
- <Add option="-pedantic" />
- <Add option="-Wall" />
- </Compiler>
- <Unit filename="src\msw\usb_com_layer.c">
- <Option compilerVar="CC" />
- </Unit>
- <Unit filename="src\msw\usb_com_layer.h" />
- <Unit filename="src\unix\usb_com_layer.c">
- <Option compilerVar="CC" />
- </Unit>
- <Unit filename="src\unix\usb_com_layer.h" />
- <Unit filename="src\usb_com_layer.h" />
- <Unit filename="src\usb_com_layer_wrap.c">
- <Option compilerVar="CC" />
- </Unit>
- <Extensions>
- <code_completion />
- <debugger />
- </Extensions>
- </Project>
-</CodeBlocks_project_file>
diff --git a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.depend b/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.depend
deleted file mode 100644
index 780b04c..0000000
--- a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.depend
+++ /dev/null
@@ -1,20 +0,0 @@
-# depslib dependency file v1.0
-1232119272 source:c:\krobot\pc_mainboard\apps\usb_com_layer\src\msw\usb_com_layer.c
- "../usb_com_layer.h"
-
-1231185852 c:\krobot\pc_mainboard\apps\usb_com_layer\src\msw\usb_com_layer.h
- <Windows.h>
- <setupapi.h>
- <stdio.h>
- <ctype.h>
- "../usb_com_layer.h"
-
-1232118435 c:\krobot\pc_mainboard\apps\usb_com_layer\src\usb_com_layer.h
- "msw/usb_com_layer.h"
- "linux/usb_com_layer.h"
-
-1231184058 c:\krobot\pc_mainboard\apps\usb_com_layer\src\generic_types.h
-
-1232119272 source:c:\krobot\pc_mainboard\apps\usb_com_layer\src\unix\usb_com_layer.c
- "../usb_com_layer.h"
-
diff --git a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.layout b/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.layout
deleted file mode 100644
index 1e1bd6a..0000000
--- a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.layout
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_layout_file>
- <ActiveTarget name="Release" />
- <File name="src\msw\usb_com_layer.c" open="1" top="0" tabpos="3">
- <Cursor position="12790" topLine="0" />
- </File>
- <File name="src\msw\usb_com_layer.h" open="1" top="0" tabpos="2">
- <Cursor position="592" topLine="0" />
- </File>
- <File name="src\unix\usb_com_layer.c" open="1" top="0" tabpos="5">
- <Cursor position="388" topLine="0" />
- </File>
- <File name="src\unix\usb_com_layer.h" open="1" top="0" tabpos="4">
- <Cursor position="486" topLine="0" />
- </File>
- <File name="src\usb_com_layer.h" open="1" top="1" tabpos="1">
- <Cursor position="482" topLine="0" />
- </File>
- <File name="src\usb_com_layer_wrap.c" open="0" top="0" tabpos="0">
- <Cursor position="82643" topLine="2825" />
- </File>
-</CodeBlocks_layout_file>
diff --git a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.workspace b/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.workspace
deleted file mode 100644
index fc2ef16..0000000
--- a/PC_Mainboard/dev/USB_Com_Layer/USB_Com_Layer.workspace
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml vers
ion="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
- <Workspace title="Workspace">
- <Project filename="USB_Com_Layer.cbp" active="1" />
- </Workspace>
-</CodeBlocks_workspace_file>
diff --git a/meca/Antiblocant balles .CATPart b/meca/Antiblocant balles .CATPart
new file mode 100644
index 0000000..3c1eb6c
Binary files /dev/null and b/meca/Antiblocant balles .CATPart differ
diff --git a/meca/Base assemblee.CATProduct b/meca/Base assemblee.CATProduct
index fa7dbe6..5a4edb1 100644
Binary files a/meca/Base assemblee.CATProduct and b/meca/Base assemblee.CATProduct differ
diff --git a/meca/Base.CATPart b/meca/Base.CATPart
index c6434d6..8fd0706 100644
Binary files a/meca/Base.CATPart and b/meca/Base.CATPart differ
diff --git a/meca/Bras tige 1.CATPart b/meca/Bras tige 1.CATPart
index e698f37..a972c68 100644
Binary files a/meca/Bras tige 1.CATPart and b/meca/Bras tige 1.CATPart differ
diff --git a/meca/Bras.CATProduct b/meca/Bras.CATProduct
index 2cccf72..8f27b68 100644
Binary files a/meca/Bras.CATProduct and b/meca/Bras.CATProduct differ
diff --git a/meca/Cartes/AX12 Interface.CATPart b/meca/Cartes/AX12 Interface.CATPart
new file mode 100644
index 0000000..2a9da00
Binary files /dev/null and b/meca/Cartes/AX12 Interface.CATPart differ
diff --git a/meca/Cartes/Robot Interface.CATPart b/meca/Cartes/Robot Interface.CATPart
new file mode 100644
index 0000000..67bc81d
Binary files /dev/null and b/meca/Cartes/Robot Interface.CATPart differ
diff --git a/meca/Courroie.CATPart b/meca/Courroie.CATPart
new file mode 100644
index 0000000..395aed5
Binary files /dev/null and b/meca/Courroie.CATPart differ
diff --git a/meca/Niveau 1 bac.CATPart b/meca/Niveau 1 bac.CATPart
index 7552286..24edab8 100644
Binary files a/meca/Niveau 1 bac.CATPart and b/meca/Niveau 1 bac.CATPart differ
diff --git a/meca/Niveau 1.CATPart b/meca/Niveau 1.CATPart
index 523ce56..b05ed76 100644
Binary files a/meca/Niveau 1.CATPart and b/meca/Niveau 1.CATPart differ
diff --git a/meca/Niveau 2.CATPart b/meca/Niveau 2.CATPart
index 0e02941..4d4f932 100644
Binary files a/meca/Niveau 2.CATPart and b/meca/Niveau 2.CATPart differ
diff --git a/meca/Support axe porte sym.CATPart b/meca/Support axe porte sym.CATPart
index 11054eb..b8d51a1 100644
Binary files a/meca/Support axe porte sym.CATPart and b/meca/Support axe porte sym.CATPart differ
diff --git a/meca/Support axe porte.CATPart b/meca/Support axe porte.CATPart
index c6df0d3..7cb6f12 100644
Binary files a/meca/Support axe porte.CATPart and b/meca/Support axe porte.CATPart differ
diff --git a/meca/Support bras.CATPart b/meca/Support bras.CATPart
index 2073f45..98a6f4e 100644
Binary files a/meca/Support bras.CATPart and b/meca/Support bras.CATPart differ
hooks/post-receive
--
krobot
|
