Merge branch 'vuplus_experimental' of code.vuplus.com:/opt/repository/dvbapp into...

diff --git a/lib/python/Plugins/Extensions/DLNAServer/dlnaserver b/lib/python/Plugins/Extensions/DLNAServer/dlnaserver
old mode 100644 (file)
new mode 100755 (executable)
index db13d83..05a13a0
Binary files a/lib/python/Plugins/Extensions/DLNAServer/dlnaserver and b/lib/python/Plugins/Extensions/DLNAServer/dlnaserver differ

diff --git a/lib/python/Plugins/Extensions/HbbTV/bookmark.py b/lib/python/Plugins/Extensions/HbbTV/bookmark.py
index 844c6a9..6e5dd7b 100644 (file)
--- a/lib/python/Plugins/Extensions/HbbTV/bookmark.py
+++ b/lib/python/Plugins/Extensions/HbbTV/bookmark.py
@@ -124,7 +124,7 @@ class BookmarkManager(SimpleConfigParser):
                        f = file('/proc/stb/info/vumodel')
                        model = f.read().strip()
                        f.close()
-                       manualmode = (model == "solo2" or model == "duo2")
+                       manualmode = (model == "solo2" or model == "duo2" or model == "solose")
 
                        os.system('echo "[__SYS__]" > %s'%(_dbFileName))
                        os.system('echo "category_current_idx = 1" >> %s'%(_dbFileName))

diff --git a/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand b/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand
old mode 100644 (file)
new mode 100755 (executable)
index 7e4f33b..88d58d3
Binary files a/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand and b/lib/python/Plugins/SystemPlugins/3GModemManager/3gcommand differ

diff --git a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
index 9bf3cbb..0eb1d35 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
@@ -62,6 +62,15 @@ if os.path.exists("/proc/stb/info/vumodel"):
                        ,"fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
                        ,"vfd"  : ["http://archive.vuplus.com/download/vfd", "vfd.files", "/dev/bcm_vfd_ctrl;"]
                        }
+       elif info == "solose":
+               fwlist= [
+                        ("fpga", _("FPGA"))
+                       ,("fp", _("Front Processor"))
+                       ]
+               fwdata= { 
+                        "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                       ,"fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
+                       }
 
 import os, fcntl, thread
 STATUS_READY           = 0