add et4000 and xp1000 remote controls
authorXPU <XP@User.(none)>
Wed, 14 Nov 2012 15:41:43 +0000 (16:41 +0100)
committerpieterg <pieterg@users.sourceforge.net>
Wed, 28 Nov 2012 17:49:51 +0000 (18:49 +0100)
Signed-off-by: pieterg <pieterg@users.sourceforge.net>

configure.ac
data/rc_models/Makefile.am
data/rc_models/et4x00/Makefile.am [new file with mode: 0644]
data/rc_models/et4x00/rc.png [new file with mode: 0644]
data/rc_models/et4x00/rcpositions.xml [new file with mode: 0644]
data/rc_models/xp1000/Makefile.am [new file with mode: 0644]
data/rc_models/xp1000/rc.png [new file with mode: 0644]
data/rc_models/xp1000/rcpositions.xml [new file with mode: 0644]
lib/python/Components/RcModel.py

index d406380..1a84b7a 100644 (file)
@@ -160,10 +160,12 @@ data/countries/Makefile
 data/extensions/Makefile
 data/keymaps/Makefile
 data/rc_models/Makefile
+data/rc_models/et4x00/Makefile
 data/rc_models/et6x00/Makefile
 data/rc_models/et9500/Makefile
 data/rc_models/et9x00/Makefile
 data/rc_models/vu/Makefile
+data/rc_models/xp1000/Makefile
 data/skin_default/Makefile
 data/skin_default/menu/Makefile
 data/skin_default/icons/Makefile
index f500263..7d1f3a6 100644 (file)
@@ -1 +1 @@
-SUBDIRS = et6x00 et9x00 et9500 vu
+SUBDIRS = et4x00 et6x00 et9x00 et9500 vu xp1000
diff --git a/data/rc_models/et4x00/Makefile.am b/data/rc_models/et4x00/Makefile.am
new file mode 100644 (file)
index 0000000..0f52d7c
--- /dev/null
@@ -0,0 +1,5 @@
+installdir = $(pkgdatadir)/rc_models/et4x00
+
+dist_install_DATA = \
+       rc.png \
+       rcpositions.xml
diff --git a/data/rc_models/et4x00/rc.png b/data/rc_models/et4x00/rc.png
new file mode 100644 (file)
index 0000000..5d91dbc
Binary files /dev/null and b/data/rc_models/et4x00/rc.png differ
diff --git a/data/rc_models/et4x00/rcpositions.xml b/data/rc_models/et4x00/rcpositions.xml
new file mode 100644 (file)
index 0000000..1d179e4
--- /dev/null
@@ -0,0 +1,46 @@
+<rcs>
+       <rc id="2">
+               <button name="POWER" pos="100,37" />
+               <button name="1" pos="28,71" />
+               <button name="2" pos="65,64" />
+               <button name="3" pos="103,71" />
+               <button name="4" pos="28,97" />
+               <button name="5" pos="65,90" />
+               <button name="6" pos="103,97" />
+               <button name="7" pos="28,125" />
+               <button name="8" pos="65,118" />
+               <button name="9" pos="103,125" />
+               <button name="ARROWLEFT" pos="28,152" />
+               <button name="0" pos="65,144" />
+               <button name="ARROWRIGHT" pos="103,152" />
+               <button name="VOL+" pos="27,254" />
+               <button name="VOL-" pos="50,272" />
+               <button name="MUTE" pos="27,38" />
+               <button name="EXIT" pos="109,99" />
+               <button name="BOUQUET+" pos="104,254" />
+               <button name="BOUQUET-" pos="80,272" />
+               <button name="INFO" pos="83,175" />
+               <button name="MENU" pos="23,198" />
+               <button name="OK" pos="66,222" />
+               <button name="UP" pos="65,196" />
+               <button name="DOWN" pos="65,248" />
+               <button name="LEFT" pos="40,222" />
+               <button name="RIGHT" pos="91,222" />
+               <button name="AUDIO" pos="65,399" />
+               <button name="RED" pos="29,319" />
+               <button name="GREEN" pos="54,326" />
+               <button name="YELLOW" pos="78,326" />
+               <button name="BLUE" pos="102,319" />
+               <button name="TV" pos="34,417" />
+               <button name="RADIO" pos="66,419" />
+               <button name="TEXT" pos="34,398" />
+               <button name="HELP" pos="97,418" />
+               <button name="PVR" pos="98,292" />
+               <button name="RECORD" pos="32,357" />
+               <button name="PLAY" pos="66,357" />
+               <button name="PAUSE" pos="66,357" />
+               <button name="REWIND" pos="34,377" />
+               <button name="FASTFORWARD" pos="98,377" />
+               <button name="STOP" pos="66,377" />
+       </rc>
+</rcs>
diff --git a/data/rc_models/xp1000/Makefile.am b/data/rc_models/xp1000/Makefile.am
new file mode 100644 (file)
index 0000000..863e928
--- /dev/null
@@ -0,0 +1,5 @@
+installdir = $(pkgdatadir)/rc_models/xp1000
+
+dist_install_DATA = \
+       rc.png \
+       rcpositions.xml
diff --git a/data/rc_models/xp1000/rc.png b/data/rc_models/xp1000/rc.png
new file mode 100644 (file)
index 0000000..3983a43
Binary files /dev/null and b/data/rc_models/xp1000/rc.png differ
diff --git a/data/rc_models/xp1000/rcpositions.xml b/data/rc_models/xp1000/rcpositions.xml
new file mode 100644 (file)
index 0000000..dcec490
--- /dev/null
@@ -0,0 +1,46 @@
+<rcs>
+       <rc id="2">
+               <button name="POWER" pos="55,30" />
+               <button name="1" pos="24,57" />
+               <button name="2" pos="55,57" />
+               <button name="3" pos="87,57" />
+               <button name="4" pos="24,77" />
+               <button name="5" pos="55,77" />
+               <button name="6" pos="87,77" />
+               <button name="7" pos="24,97" />
+               <button name="8" pos="55,97" />
+               <button name="9" pos="87,97" />
+               <button name="ARROWLEFT" pos="24,116" />
+               <button name="0" pos="55,116" />
+               <button name="ARROWRIGHT" pos="87,116" />
+               <button name="VOL+" pos="22,273" />
+               <button name="VOL-" pos="22,303" />
+               <button name="MUTE" pos="55,287" />
+               <button name="EXIT" pos="19,212" />
+               <button name="BOUQUET+" pos="89,273" />
+               <button name="BOUQUET-" pos="89,303" />
+               <button name="INFO" pos="92,147" />
+               <button name="MENU" pos="22,243" />
+               <button name="OK" pos="55,180" />
+               <button name="UP" pos="55,154" />
+               <button name="DOWN" pos="55,206" />
+               <button name="LEFT" pos="29,180" />
+               <button name="RIGHT" pos="81,180" />
+               <button name="AUDIO" pos="44,396" />
+               <button name="RED" pos="20,332" />
+               <button name="GREEN" pos="44,332" />
+               <button name="YELLOW" pos="67,332" />
+               <button name="BLUE" pos="91,332" />
+               <button name="TV" pos="44,415" />
+               <button name="RADIO" pos="67,415" />
+               <button name="TEXT" pos="20,396" />
+               <button name="HELP" pos="91,396" />
+               <button name="PVR" pos="89,244" />
+               <button name="RECORD" pos="20,351" />
+               <button name="PLAY" pos="67,351" />
+               <button name="PAUSE" pos="67,351" />
+               <button name="REWIND" pos="44,370" />
+               <button name="FASTFORWARD" pos="67,370" />
+               <button name="STOP" pos="44,351" />
+       </rc>
+</rcs>
index 8eeeacd..afe362e 100644 (file)
@@ -6,6 +6,8 @@ class RcModel:
        RCTYPE_ET6X00 = 2
        RCTYPE_ET9500 = 3
        RCTYPE_VU = 4
+       RCTYPE_ET4X00 = 5
+       RCTYPE_XP1000 = 6       
 
        def __init__(self):
                self.currentRcType = self.RCTYPE_DMM
@@ -25,7 +27,7 @@ class RcModel:
        def readRcTypeFromProc(self):
                if os.path.exists('/proc/stb/info/boxtype'):
                        model = self.readFile('/proc/stb/info/boxtype')
-                       if len(model) == 6 and model[:2] == 'et':
+                       if len(model) == 6 and model[:2] == 'et' or 'xp':
                                rc = self.readFile('/proc/stb/ir/rc/type')
                                if rc == '4':
                                        self.currentRcType = self.RCTYPE_DMM
@@ -39,6 +41,11 @@ class RcModel:
                                        self.currentRcType = self.RCTYPE_VU
                                elif rc == '9':
                                        self.currentRcType = self.RCTYPE_ET9500
+                               elif rc == '13':
+                                       self.currentRcType = self.RCTYPE_ET4X00
+                               elif rc == '14':
+                                       self.currentRcType = self.RCTYPE_XP1000
+
                elif os.path.exists('/proc/stb/info/vumodel'):
                        self.currentRcType = self.RCTYPE_VU
 
@@ -49,6 +56,10 @@ class RcModel:
                        return '/usr/share/enigma2/rc_models/et9500/'
                elif self.currentRcType == self.RCTYPE_ET6X00:
                        return '/usr/share/enigma2/rc_models/et6x00/'
+               elif self.currentRcType == self.RCTYPE_ET4X00:
+                       return '/usr/share/enigma2/rc_models/et4x00/'
+               elif self.currentRcType == self.RCTYPE_XP1000:
+                       return '/usr/share/enigma2/rc_models/xp1000/'                   
                elif self.currentRcType == self.RCTYPE_VU:
                        return '/usr/share/enigma2/rc_models/vu/'