c't

c't-Projekte - Mailinglisten


[Voriger (Datum)] [Nächster (Datum)] [Voriger (Thread)] [Nächster (Thread)]
[Nach Datum][Nach Thread]

Re: [ct-bot] rc5-codes für Fernbedienung VIVANCO UR89

Absender: Andreas Staudenmayer
Datum: Sa, 25.03.2006 17:43:26
References: <000601c64dd0$f1b6c060$65e8a8c0@ASBOLL2><44218524.9070706@xxxxxxxx><000f01c65027$0ed42a90$65e8a8c0@ASBOLL2> <200603251725.37028.bbe@xxxxxxxx>


Benjamin Benz <bbe@xxxxxxxx> wrote:
Hallo
Sieht gut aus. Wenn Sie jetzt noch die Umlaute aus den Kommetaren
entfernen, spiele ich den Patch auch ein.
OK, hier ohne Umlaute
Gruß Andreas
--
Andreas Staudenmayer
Heimbachstr. 13
73087 Boll
Index: .cdtbuild
===================================================================
RCS file: /ctbot/ct-Bot/.cdtbuild,v
retrieving revision 1.5
diff -u -r1.5 .cdtbuild
--- .cdtbuild	24 Mar 2006 18:07:51 -0000	1.5
+++ .cdtbuild	25 Mar 2006 18:02:03 -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="&quot;${ProjDirPath}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/include&quot;"/>
-<listOptionValue builtIn="false" value="&quot;C:\Programme\MinGW\include&quot;"/>
-<listOptionValue builtIn="false" value="&quot;C:\Programme\pthreads\pthreads.2&quot;"/>
+<listOptionValue builtIn="false" value="&quot;D:\Programme\MinGW\include&quot;"/>
+<listOptionValue builtIn="false" value="&quot;E:\Eigene Dateien\Downloads\ctbot\Entwicklungssoftware\pthreads-w32-2-7-0-release\pthreads.2&quot;"/>
</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="&quot;C:\Programme\pthreads\Pre-built.2\lib&quot;"/>
-<listOptionValue builtIn="false" value="&quot;C:\Programme\MinGW\lib&quot;"/>
+<listOptionValue builtIn="false" value="&quot;E:\Eigene Dateien\Downloads\ctbot\Entwicklungssoftware\pthreads-w32-2-7-0-release\pthreads.2&quot;"/>
+<listOptionValue builtIn="false" value="&quot;D:\Programme\MinGW\lib&quot;"/>
</option>
<option id="gnu.c.link.option.noshared.1812776571" superClass="gnu.c.link.option.noshared" value="true" valueType="boolean"/>
</tool>
@@ -113,6 +113,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="&quot;${ProjDirPath}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/include&quot;"/>
+<listOptionValue builtIn="false" value="&quot;D:\Programme\WinAVR\avr\include&quot;"/>
</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"/>
@@ -123,7 +124,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="&quot;C:\Programme\WinAVR\lib&quot;"/>
+<listOptionValue builtIn="false" value="&quot;D:\Programme\WinAVR\lib&quot;"/>
</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	25 Mar 2006 18:02:03 -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: include/rc5-codes.h
===================================================================
RCS file: /ctbot/ct-Bot/include/rc5-codes.h,v
retrieving revision 1.10
diff -u -r1.10 rc5-codes.h
--- include/rc5-codes.h	24 Mar 2006 10:44:00 -0000	1.10
+++ include/rc5-codes.h	25 Mar 2006 18:02:03 -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,11 +61,52 @@
 */


-
+#define RC_HAVE_VIVANCO_UR89
//#define RC_HAVE_HAUPPAUGE_WINTV
//#define RC_HAVE_CONRAD_MediaMPV
//#define RC_HAVE_CONRAD_PROMO8

+/*!
+ * Fernbedienung VIVANCO UR89, vor Verwendung auf VCR druecken
+ * @author Andreas Staudenmayer
+ */
+
+#ifdef RC_HAVE_VIVANCO_UR89
+	#define RC_HAVE_CODES							/*!< Definiert Codes */
+	#undef JOG_DIAL									/*!< Hat keinen Jog Dial */
+
+	#define RC5_NOT_AVAIL	(0xFFFF)				/*!< Code fuer Taste nicht vorhanden */
+
+	#define RC5_MASK (RC5_COMMAND|RC5_ADDRESS)		/*!< Welcher Teil des Kommandos wird ausgewertet? */
+
+	#define	RC5_CODE_0		(0x1140 & RC5_MASK)		/*!< Taste 0 			   */
+	#define	RC5_CODE_1		(0x1141 & RC5_MASK)		/*!< Taste 1 			   */
+	#define	RC5_CODE_2		(0x1142 & RC5_MASK)		/*!< Taste 2 			   */
+	#define	RC5_CODE_3		(0x1143 & RC5_MASK)		/*!< Taste 3 			   */
+	#define	RC5_CODE_4		(0x1144 & RC5_MASK)		/*!< Taste 4 			   */
+	#define	RC5_CODE_5		(0x1145 & RC5_MASK)		/*!< Taste 5 			   */
+	#define	RC5_CODE_6		(0x1146 & RC5_MASK)		/*!< Taste 6 			   */
+	#define	RC5_CODE_7		(0x1147 & RC5_MASK)		/*!< Taste 7 			   */
+	#define	RC5_CODE_8		(0x1148 & RC5_MASK)		/*!< Taste 8 			   */
+	#define	RC5_CODE_9		(0x1149 & RC5_MASK)		/*!< Taste 9 			   */
+
+	#define	RC5_CODE_PWR	(0x114C & RC5_MASK)		/*!< Taste An, Aus         */
+	#define	RC5_CODE_VIEW	RC5_NOT_AVAIL			/*!< Taste nicht vorhanden */
+	#define	RC5_CODE_SELECT	RC5_NOT_AVAIL			/*!< Taste nicht vorhanden */
+
+	#define	RC5_CODE_UP		(0x1140 & RC5_MASK)		/*!< Taste Hoch            */
+	#define	RC5_CODE_DOWN	(0x1161 & RC5_MASK)		/*!< Taste Runter          */
+	#define	RC5_CODE_LEFT	(0x0171 & RC5_MASK)		/*!< Taste Links           */
+	#define	RC5_CODE_RIGHT	(0x0170 & 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	(0x1172 & RC5_MASK)		/*!< rote Taste            */
+	#define RC5_CODE_GREEN	(0x1176 & RC5_MASK)		/*!< gruene Taste          */
+	#define RC5_CODE_YELLOW	(0x1175 & RC5_MASK)		/*!< gelbe Taste           */
+	#define RC5_CODE_BLUE	(0x1174 & RC5_MASK)		/*!< blaue Taste           */
+
+#endif /* RC_HAVE_VIVANCO_UR89 */

/*!
 * Fernbedienung Hauppauge (simple WinTV-Karten Fernbedienung)
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