Absender: Andreas Staudenmayer
Datum: Mi, 22.03.2006 17:56:19
Gruß Andreas -- Andreas Staudenmayer Heimbachstr. 13 73087 Boll
Index: .cdtbuild =================================================================== RCS file: /ctbot/ct-Bot/.cdtbuild,v retrieving revision 1.3 diff -u -r1.3 .cdtbuild --- .cdtbuild 17 Mar 2006 17:09:23 -0000 1.3 +++ .cdtbuild 22 Mar 2006 18:06:16 -0000 @@ -10,8 +10,8 @@ <option id="gnu.c.compiler.option.include.paths.387475860" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${ProjDirPath}""/> <listOptionValue builtIn="false" value=""${ProjDirPath}/include""/> -<listOptionValue builtIn="false" value=""C:\Programme\MinGW\include""/> -<listOptionValue builtIn="false" value=""C:\Programme\pthreads\pthreads.2""/> +<listOptionValue builtIn="false" value=""D:\Programme\MinGW\include""/> +<listOptionValue builtIn="false" value=""E:\Eigene Dateien\Downloads\ctbot\Entwicklungssoftware\pthreads-w32-2-7-0-release\pthreads.2""/> </option> <option id="gnu.c.compiler.option.preprocessor.def.symbols.1823712582" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="PC"/> @@ -26,8 +26,8 @@ <listOptionValue builtIn="false" value="pthreadGC2"/> </option> <option id="gnu.c.link.option.paths.142594843" superClass="gnu.c.link.option.paths" valueType="stringList"> -<listOptionValue builtIn="false" value=""C:\Programme\pthreads\Pre-built.2\lib""/> -<listOptionValue builtIn="false" value=""C:\Programme\MinGW\lib""/> +<listOptionValue builtIn="false" value=""E:\Eigene Dateien\Downloads\ctbot\Entwicklungssoftware\pthreads-w32-2-7-0-release\pthreads.2""/> +<listOptionValue builtIn="false" value=""D:\Programme\MinGW\lib""/> </option> <option id="gnu.c.link.option.noshared.1812776571" superClass="gnu.c.link.option.noshared" value="true" valueType="boolean"/> </tool> @@ -112,6 +112,7 @@ <option id="gnu.c.compiler.option.include.paths.818995866" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath"> <listOptionValue builtIn="false" value=""${ProjDirPath}""/> <listOptionValue builtIn="false" value=""${ProjDirPath}/include""/> +<listOptionValue builtIn="false" value=""D:\Programme\WinAVR\avr\include""/> </option> <option id="gnu.c.compiler.option.preprocessor.def.symbols.736140060" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="MCU"/> @@ -122,7 +123,7 @@ <tool command="avr-gcc" id="cdt.managedbuild.tool.gnu.c.linker.exe.debug.1422052481" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.exe.debug"> <option id="gnu.c.link.option.libs.1944124942" name="Libraries (-l)" superClass="gnu.c.link.option.libs"/> <option id="gnu.c.link.option.paths.1035619079" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="stringList"> -<listOptionValue builtIn="false" value=""C:\Programme\WinAVR\lib""/> +<listOptionValue builtIn="false" value=""D:\Programme\WinAVR\lib""/> </option> <option id="gnu.c.link.option.noshared.456282519" name="No shared libraries (-static)" superClass="gnu.c.link.option.noshared" value="false" valueType="boolean"/> <option id="gnu.c.link.option.ldflags.918822459" name="Linker flags" superClass="gnu.c.link.option.ldflags" value="-mmcu=atmega32" valueType="string"/> Index: .cdtproject =================================================================== RCS file: /ctbot/ct-Bot/.cdtproject,v retrieving revision 1.1 diff -u -r1.1 .cdtproject --- .cdtproject 19 Jan 2006 17:32:09 -0000 1.1 +++ .cdtproject 22 Mar 2006 18:06:16 -0000 @@ -2,27 +2,21 @@ <?eclipse-cdt version="2.0"?> <cdtproject id="org.eclipse.cdt.managedbuilder.core.managedMake"> -<extension point="org.eclipse.cdt.core.ScannerInfoProvider" id="org.eclipse.cdt.managedbuilder.core.ManagedBuildManager"/> -<extension point="org.eclipse.cdt.core.ScannerInfoProvider" id="org.eclipse.cdt.managedbuilder.core.ManagedBuildManager"/> -<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.ELF"/> -<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.PE"/> -<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.GNU_ELF"> +<extension id="org.eclipse.cdt.managedbuilder.core.ManagedBuildManager" point="org.eclipse.cdt.core.ScannerInfoProvider"/> +<extension id="org.eclipse.cdt.managedbuilder.core.ManagedBuildManager" point="org.eclipse.cdt.core.ScannerInfoProvider"/> +<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> +<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> +<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"> <attribute key="addr2line" value="addr2line"/> <attribute key="c++filt" value="c++filt"/> </extension> -<extension point="org.eclipse.cdt.core.BinaryParser" id="org.eclipse.cdt.core.Cygwin_PE"> +<extension id="org.eclipse.cdt.core.Cygwin_PE" point="org.eclipse.cdt.core.BinaryParser"> <attribute key="addr2line" value="addr2line"/> <attribute key="cygpath" value="cygpath"/> <attribute key="c++filt" value="c++filt"/> <attribute key="nm" value="nm"/> </extension> -<extension point="org.eclipse.cdt.core.CIndexer" id="org.eclipse.cdt.core.ctagsindexer"> -<attribute key="ctagslocation" value=""/> -<attribute key="ctagfiletype" value="ctags_internal"/> -<attribute key="ctagsindexincludes" value="true"/> -<attribute key="ctagfilelocation" value=""/> -<attribute key="ctagslocationtype" value="ctags_path_default"/> -</extension> +<extension id="org.eclipse.cdt.core.domsourceindexer" point="org.eclipse.cdt.core.CIndexer"/> <data> <item id="org.eclipse.cdt.core.pathentry"> <pathentry kind="src" path=""/> Index: .settings/org.eclipse.cdt.managedbuilder.core.prefs =================================================================== RCS file: /ctbot/ct-Bot/.settings/org.eclipse.cdt.managedbuilder.core.prefs,v retrieving revision 1.3 diff -u -r1.3 org.eclipse.cdt.managedbuilder.core.prefs --- .settings/org.eclipse.cdt.managedbuilder.core.prefs 17 Mar 2006 17:09:24 -0000 1.3 +++ .settings/org.eclipse.cdt.managedbuilder.core.prefs 22 Mar 2006 18:06:16 -0000 @@ -1,4 +1,4 @@ -#Mon Feb 13 13:24:42 CET 2006 +#Mon Mar 20 20:24:01 CET 2006 eclipse.preferences.version=1 environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.exe.debug.1077176217=<?xml version\="1.0" encoding\="UTF-8"?>\n<environment>\n<variable name\="CPATH" operation\="remove"/>\n<variable name\="C_INCLUDE_PATH" operation\="remove"/>\n</environment>\n environment/buildEnvironmentInclude/cdt.managedbuild.config.gnu.exe.debug.1150677647=<?xml version\="1.0" encoding\="UTF-8"?>\n<environment>\n<variable name\="CPATH" operation\="remove"/>\n<variable name\="C_INCLUDE_PATH" operation\="remove"/>\n</environment>\n @@ -12,7 +12,7 @@ environment/buildEnvironmentLibrary/cdt.managedbuild.config.gnu.exe.release.1181183675=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<environment>\r\n<variable name\="LIBRARY_PATH" operation\="remove"/>\r\n</environment>\r\n environment/project=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<environment>\r\n<variable delimiter\="/" name\="${ProjDirPath}" operation\="replace" value\="C\:\\Dokumente und Einstellungen\\pek\\Eigene Dateien\\ctSim_2006\\workspace\\ct-Bot"/>\r\n</environment>\r\n environment/project/cdt.managedbuild.config.gnu.exe.debug.1077176217=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<environment/>\r\n -environment/project/cdt.managedbuild.config.gnu.exe.debug.1150677647=<?xml version\="1.0" encoding\="UTF-8"?>\n<environment/>\n +environment/project/cdt.managedbuild.config.gnu.exe.debug.1150677647=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<environment/>\r\n environment/project/cdt.managedbuild.config.gnu.exe.debug.1197043799=<?xml version\="1.0" encoding\="UTF-8"?>\n<environment>\n<variable name\="PATH" value\="\:/usr/local/avr/bin" operation\="append"/>\n</environment>\n environment/project/cdt.managedbuild.config.gnu.exe.debug.2039935845=<?xml version\="1.0" encoding\="UTF-8"?>\n<environment/>\n environment/project/cdt.managedbuild.config.gnu.exe.release.1181183675=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<environment/>\r\n Index: include/rc5-codes.h =================================================================== RCS file: /ctbot/ct-Bot/include/rc5-codes.h,v retrieving revision 1.8 diff -u -r1.8 rc5-codes.h --- include/rc5-codes.h 21 Mar 2006 11:44:59 -0000 1.8 +++ include/rc5-codes.h 22 Mar 2006 18:06:16 -0000 @@ -37,7 +37,7 @@ * Zum erfassen neuer Codes sollte man unbedingt RC5_MASK auf (RC5_COMMAND|RC5_ADDRESS) setzen */ // Normalbetrieb -#define RC5_MASK (RC5_COMMAND) /*!< Welcher Teil des Kommandos wird ausgewertet? */ +//#define RC5_MASK (RC5_COMMAND) /*!< Welcher Teil des Kommandos wird ausgewertet? */ // Erfassen neuer FB-Codes //#define RC5_MASK (RC5_COMMAND|RC5_ADDRESS) /*!< Welcher Teil des Kommandos wird ausgewertet? */ @@ -61,10 +61,49 @@ */ - +#define RC_HAVE_VIVANCO_UR89 //#define RC_HAVE_HAUPPAUGE_WINTV //#define RC_HAVE_CONRAD_PROMO8 +/*! + * Fernbedienung VIVANCO UR89, vor Verwendung auf VCR druecken + */ + +#ifdef RC_HAVE_VIVANCO_UR89 + #define RC_HAVE_CODES /*!< Definiert Codes */ + #undef JOG_DIAL /*!< Hat keinen Jog Dial */ + + #define RC5_NOT_AVAIL (0xFFFF) /*!< Code f�r Taste nicht vorhanden */ + #define RC5_MASK (0x003F) /*!< Welcher Teil des Kommandos wird ausgewertet? */ + + #define RC5_CODE_0 (0x1000 & RC5_MASK) /*!< Taste 0 */ + #define RC5_CODE_1 (0x1001 & RC5_MASK) /*!< Taste 1 */ + #define RC5_CODE_2 (0x1002 & RC5_MASK) /*!< Taste 2 */ + #define RC5_CODE_3 (0x1003 & RC5_MASK) /*!< Taste 3 */ + #define RC5_CODE_4 (0x1004 & RC5_MASK) /*!< Taste 4 */ + #define RC5_CODE_5 (0x1005 & RC5_MASK) /*!< Taste 5 */ + #define RC5_CODE_6 (0x1006 & RC5_MASK) /*!< Taste 6 */ + #define RC5_CODE_7 (0x1007 & RC5_MASK) /*!< Taste 7 */ + #define RC5_CODE_8 (0x1008 & RC5_MASK) /*!< Taste 8 */ + #define RC5_CODE_9 (0x1009 & RC5_MASK) /*!< Taste 9 */ + + #define RC5_CODE_PWR (0x100C & RC5_MASK) /*!< Taste An, AUS */ + #define RC5_CODE_VIEW RC5_NOT_AVAIL /*!< Taste */ + #define RC5_CODE_SELECT RC5_NOT_AVAIL /*!< Taste */ + + #define RC5_CODE_UP (0x1020 & RC5_MASK) /*!< Taste Hoch */ + #define RC5_CODE_DOWN (0x1021 & RC5_MASK) /*!< Taste Runter */ + #define RC5_CODE_LEFT (0x0031 & RC5_MASK) /*!< Taste Links */ + #define RC5_CODE_RIGHT (0x0030 & RC5_MASK) /*!< Taste Rechts */ + + #define RC5_CODE_FWD RC5_NOT_AVAIL /*!< Taste nicht vorhanden */ + #define RC5_CODE_BWD RC5_NOT_AVAIL /*!< Taste nicht vorhanden */ + #define RC5_CODE_RED (0x1032 & RC5_MASK) /*!< rote Taste */ + #define RC5_CODE_GREEN (0x1036 & RC5_MASK) /*!< grüne Taste */ + #define RC5_CODE_YELLOW (0x1035 & RC5_MASK) /*!< gelbe Taste */ + #define RC5_CODE_BLUE (0x1034 & RC5_MASK) /*!< blaue Taste */ + +#endif /* RC_HAVE_VIVANCO_UR89 */ /*! Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,1 @@ +.cdtbuild Index: include/.cvsignore =================================================================== RCS file: include/.cvsignore diff -N include/.cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ include/.cvsignore 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,2 @@ +rc5-codes.h +bot-local.h