Add remote-control picture for Xsarius box
authortechnl <tech@openpli.org>
Sat, 19 Sep 2015 14:51:14 +0000 (16:51 +0200)
committertechnl <tech@openpli.org>
Sat, 19 Sep 2015 14:51:14 +0000 (16:51 +0200)
data/hw_info/hw_info.cfg
data/rc_models/Makefile.am
data/rc_models/rc_models.cfg
data/rc_models/xsarius.png [new file with mode: 0644]
data/rc_models/xsarius.xml [new file with mode: 0644]
lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
lib/python/Tools/HardwareInfo.py

index a863aa5..5bb8ffc 100644 (file)
@@ -3,6 +3,8 @@
 # the second column can be used define a prefix (e.g. Vu+ boxen)
 # Lines starting with a # or only containing whitespace are skipped
 
+
+hwmodel
 boxtype
 vumodel    vu
 azmodel
index b1b6396..708c69f 100644 (file)
@@ -7,4 +7,4 @@ dist_install_DATA = \
        hd2400.png  hd1100.png \
        dmmadv.xml  et4x00.xml  et8000.xml  et9x00.xml  vuultimo.xml  xp1000.xml \
        dmm.xml     et6x00.xml  et9500.xml  et7x00.xml  vuduo2.xml    vu.xml        formuler1.xml \
-       hd2400.xml  hd1100.xml
\ No newline at end of file
+       hd2400.xml  hd1100.xml  xsarius.xml  xsarius.png
index 9b2461d..28a6bd3 100644 (file)
@@ -50,4 +50,4 @@ et7500 et7x00
 et8500 et8000
 hd2400 hd2400
 hd1100 hd1100
-hd1200 hd1100
+fusionhd  xsarius
diff --git a/data/rc_models/xsarius.png b/data/rc_models/xsarius.png
new file mode 100644 (file)
index 0000000..79fab45
Binary files /dev/null and b/data/rc_models/xsarius.png differ
diff --git a/data/rc_models/xsarius.xml b/data/rc_models/xsarius.xml
new file mode 100644 (file)
index 0000000..84cdab9
--- /dev/null
@@ -0,0 +1,152 @@
+<rcs>
+       <rc id="0">
+               <button name="SHIFT" pos="58,21" />
+               <button name="POWER" pos="90,21" />
+               <button name="DREAMSELECT" pos="54,53" />
+               <button name="TVSELECT" pos="98,53" />
+               <button name="1" pos="37,83" />
+               <button name="2" pos="76,83" />
+               <button name="3" pos="115,83" />
+               <button name="4" pos="37,105" />
+               <button name="5" pos="76,105" />
+               <button name="6" pos="115,105" />
+               <button name="7" pos="37,126" />
+               <button name="8" pos="76,126" />
+               <button name="9" pos="115,126" />
+               <button name="ARROWLEFT" pos="48,308" />
+               <button name="0" pos="76,148" />
+               <button name="ARROWRIGHT" pos="120,308" />
+               <button name="VOL+" pos="30,184" />
+               <button name="VOL-" pos="39,208" />
+               <button name="MUTE" pos="76,179" />
+               <button name="EXIT" pos="76,201" />
+               <button name="BOUQUET+" pos="122,184" />
+               <button name="BOUQUET-" pos="113,208" />
+               <button name="INFO" pos="28,238" />
+               <button name="MENU" pos="124,238" />
+               <button name="OK" pos="77,266" />
+               <button name="UP" pos="77,241" />
+               <button name="DOWN" pos="77,291" />
+               <button name="LEFT" pos="48,266" />
+               <button name="RIGHT" pos="106,266" />
+               <button name="HELP" pos="32,298" />
+               <button name="PVR" pos="121,298" />
+               <button name="RED" pos="34,333" />
+               <button name="GREEN" pos="61,335" />
+               <button name="YELLOW" pos="90,335" />
+               <button name="BLUE" pos="118,333" />
+               <button name="REWIND" pos="37,365" />
+               <button name="PLAYPAUSE" pos="64,366" />
+               <button name="STOP" pos="90,366" />
+               <button name="FASTFORWARD" pos="117,365" />
+               <button name="TV" pos="40,397" />
+               <button name="RADIO" pos="65,399" />
+               <button name="TEXT" pos="89,399" />
+               <button name="RECORD" pos="113,397" />
+       </rc>
+       <rc id="1">
+               <button name="POWER" pos="93,23" />
+               <button name="DREAMSELECT" pos="51,55" />
+               <button name="TVSELECT" pos="97,55" />
+               <button name="1" pos="38,81" />
+               <button name="2" pos="62,89" />
+               <button name="3" pos="113,81" />
+               <button name="4" pos="38,102" />
+               <button name="5" pos="77,102" />
+               <button name="6" pos="113,102" />
+               <button name="7" pos="38,122" />
+               <button name="8" pos="62,126" />
+               <button name="9" pos="113,122" />
+               <button name="ARROWLEFT" pos="50,258" />
+               <button name="0" pos="77,143" />
+               <button name="ARROWRIGHT" pos="100,258" />
+               <button name="VOL+" pos="31,181" />
+               <button name="VOL-" pos="42,206" />
+               <button name="MUTE" pos="76,172" />
+               <button name="EXIT" pos="111,234" />
+               <button name="BOUQUET+" pos="111,181" />
+               <button name="BOUQUET-" pos="111,206" />
+               <button name="INFO" pos="74,173" />
+               <button name="MENU" pos="38,235" />
+               <button name="OK" pos="74,200" />
+               <button name="UP" pos="76,235" />
+               <button name="DOWN" pos="76,289" />
+               <button name="LEFT" pos="47,255" />
+               <button name="RIGHT" pos="103,255" />
+               <button name="AUDIO" pos="76,205" />
+               <button name="VIDEO" pos="43,148" />
+               <button name="RED" pos="54,480" />
+               <button name="GREEN" pos="62,330" />
+               <button name="YELLOW" pos="89,330" />
+               <button name="BLUE" pos="114,431" />
+               <button name="TV" pos="38,480" />
+               <button name="RADIO" pos="113,480" />
+               <button name="TEXT" pos="41,123" />
+               <button name="HELP" pos="114,362" />
+               <!-- [iq] Added Remocon Position Key-->
+               <button name="RECORD" pos="63,480" />
+        <button name="PLAYPAUSE" pos="88,455" />
+        <button name="STOP" pos="88,480" /> 
+        <button name="SUBTITLE" pos="77,123" />
+        <button name="PLAY" pos="74,400" />
+               <!-- [iq -->
+               <button name="BACK" pos="38, 258" />
+               <button name="FORWARD" pos="38, 455" />
+               <!-- iq] -->
+       </rc>
+       <rc id="2">
+               <button name="POWER" pos="93,23" />
+               <button name="DREAMSELECT" pos="51,55" />
+               <button name="TVSELECT" pos="97,55" />
+               <button name="1" pos="38,81" />
+               <button name="2" pos="75,320" />
+               <button name="3" pos="113,81" />
+               <button name="4" pos="38,102" />
+               <button name="5" pos="77,102" />
+               <button name="6" pos="113,102" />
+               <button name="7" pos="38,122" />
+               <button name="8" pos="75,380" />
+               <button name="9" pos="113,122" />
+               <button name="ARROWLEFT" pos="45,210" />
+               <button name="0" pos="73,355" />
+               <button name="ARROWRIGHT" pos="101,210" />
+               <button name="VOL+" pos="31,181" />
+               <button name="VOL-" pos="42,206" />
+               <button name="MUTE" pos="76,172" />
+               <button name="EXIT" pos="115,234" />
+               <button name="BOUQUET+" pos="72,190" />
+               <button name="BOUQUET-" pos="72,240" />
+               <button name="INFO" pos="111,234" />
+               <button name="MENU" pos="34,180" />
+               <button name="OK" pos="73,200" />
+               <button name="UP" pos="72,190" />
+               <button name="DOWN" pos="72,240" />
+               <button name="LEFT" pos="38,360" />
+               <button name="RIGHT" pos="107,360" />
+               <button name="AUDIO" pos="73,150" />
+               <button name="VIDEO" pos="43,148" />
+               <button name="RED" pos="36,385" />
+               <button name="GREEN" pos="61,386" />
+               <button name="YELLOW" pos="86,385" />
+               <button name="BLUE" pos="111,385" />
+               <button name="TV" pos="36,435" />
+               <button name="PVR" pos="39,95" />
+               <button name="RADIO" pos="111,435" />
+               <button name="TEXT" pos="37,73" />
+               <button name="HELP" pos="114,362" />
+               <!-- [iq] Added Remocon Position Key-->
+               <button name="RECORD" pos="61,435" />
+        <button name="PLAYPAUSE" pos="88,455" />
+        <button name="STOP" pos="86,435" /> 
+        <button name="SUBTITLE" pos="77,123" />
+        <button name="PLAY" pos="62,410" />
+        <button name="PAUSE" pos="86,410" />
+        <button name="FASTFORWARD" pos="111,410" />
+        <button name="REWIND" pos="38,410" />
+               <!-- [iq -->
+               <button name="BACK" pos="38, 258" />
+               <button name="FORWARD" pos="38, 455" />
+               <!-- iq] -->
+       </rc>
+
+</rcs>
index 7f39456..d76a820 100644 (file)
@@ -3,6 +3,7 @@ from Components.config import config, ConfigSelection, ConfigSubDict, ConfigYesN
 
 from Tools.CList import CList
 from Tools.HardwareInfo import HardwareInfo
+from Tools.Directories import fileExists
 from os import path
 
 # The "VideoHardware" is the interface to /proc/stb/video.
@@ -58,8 +59,9 @@ class VideoHardware:
                "640x480" : { 60: "640x480" }
        }
 
-       modes["Scart"] = ["PAL", "NTSC", "Multi"]
-       modes["YPbPr"] = ["720p", "1080i", "576p", "480p", "576i", "480i"]
+       if not fileExists("/proc/stb/info/hwmodel") and not HardwareInfo().get_device_name == "fusionhd":
+               modes["Scart"] = ["PAL", "NTSC", "Multi"]
+               modes["YPbPr"] = ["720p", "1080i", "576p", "480p", "576i", "480i"]
        modes["DVI"] = ["720p", "1080p", "1080i", "576p", "480p", "576i", "480i"]
        modes["DVI-PC"] = ["PC"]
 
@@ -251,11 +253,15 @@ class VideoHardware:
 
                        # create list of available modes
                        modes = self.getModeList(port)
+                       print "[mode+**********+++++++]", modes
                        if len(modes):
                                config.av.videomode[port] = ConfigSelection(choices = [mode for (mode, rates) in modes])
                        for (mode, rates) in modes:
                                config.av.videorate[mode] = ConfigSelection(choices = rates)
                config.av.videoport = ConfigSelection(choices = lst)
+                if HardwareInfo().get_device_model == "fusionhd":
+                        config.av.videoport = ConfigSelection(choices = dest)
+               print "[createConfig]+++++++******+++++]", lst
 
        def setConfiguredMode(self):
                port = config.av.videoport.value
index bb58648..2ec0f5b 100644 (file)
@@ -30,9 +30,11 @@ class HardwareInfo:
 
                # Name ... bit odd, but history prevails
                try:
-                       self.device_name = open("/proc/stb/info/model").read().strip()
+                       self.device_name = open("/proc/stb/info/hwmodel").read().strip()
                except:
                        pass
+               else:
+                       self.device_name = open("/proc/stb/info/model").read().strip()
 
                # Model
                for line in open((resolveFilename(SCOPE_SKIN, 'hw_info/hw_info.cfg')), 'r'):