diff --git a/lib/python/Components/About.py b/lib/python/Components/About.py index 8076947297f..70f789c66ff 100644 --- a/lib/python/Components/About.py +++ b/lib/python/Components/About.py @@ -65,7 +65,7 @@ def getCPUSpeedString(): return "1,5 GHz" elif getMachineBuild() in ('formuler1tc','formuler1', 'triplex', 'tiviaraplus'): return "1,3 GHz" - elif getMachineBuild() in ('gbmv200','u51','u52','u53','u532','u533','u54','u55','u56','u57','u5','u5pvr','h9','h9combo','h10','cc1','sf8008','sf8008m','hd60','hd61','i55plus','ustym4kpro','beyonwizv2','viper4k','v8plus','multibox','plus'): + elif getMachineBuild() in ('gbmv200','u51','u52','u53','u532','u533','u54','u55','u56','u57','u5','u5pvr','h9','i55se','h9se','h9combo','h9combose','h10','cc1','sf8008','sf8008m','hd60','hd61','i55plus','ustym4kpro','beyonwizv2','viper4k','v8plus','multibox','plus'): return "1,6 GHz" elif getMachineBuild() in ('vuuno4kse','vuuno4k','dm900','dm920', 'gb7252', 'dags7252','xc7439','8100s'): return "1,7 GHz" @@ -104,7 +104,7 @@ def getCPUSpeedString(): def getCPUString(): if getMachineBuild() in ('vuduo4k','vuduo4kse','osmio4k','osmio4kplus','osmini4k','dags72604','vuuno4kse','vuuno4k', 'vuultimo4k','vusolo4k', 'vuzero4k', 'hd51', 'hd52', 'sf4008', 'dm900','dm920', 'gb7252', 'gb72604', 'dags7252', 'vs1500', 'et1x000', 'xc7439','h7','8100s','et13000','sf5008'): return "Broadcom" - elif getMachineBuild() in ('gbmv200','u41','u42','u43','u51','u52','u53','u532','u533','u54','u55','u56','u57','u5','u5pvr','h9','h9combo','h10','cc1','sf8008','sf8008m','hd60','hd61','i55plus','ustym4kpro','beyonwizv2','viper4k','v8plus','multibox','plus','hzero','h8'): + elif getMachineBuild() in ('gbmv200','u41','u42','u43','u51','u52','u53','u532','u533','u54','u55','u56','u57','u5','u5pvr','h9','i55se','h9se','h9combo','h9combose','h10','cc1','sf8008','sf8008m','hd60','hd61','i55plus','ustym4kpro','beyonwizv2','viper4k','v8plus','multibox','plus','hzero','h8'): return "Hisilicon" elif getMachineBuild() in ('alien5',): return "AMlogic" @@ -135,7 +135,7 @@ def getCpuCoresString(): if len(splitted) > 1: splitted[1] = splitted[1].replace('\n','') if splitted[0].startswith("processor"): - if getMachineBuild() in ('gbmv200','u51','u52','u53','u532','u533','u54','u55','u56','u57','vuultimo4k','u5','u5pvr','h9','h9combo','h10','alien5','cc1','sf8008','sf8008m','hd60','hd61','i55plus','ustym4kpro','beyonwizv2','viper4k','v8plus','vuduo4k','vuduo4kse','multibox','plus'): + if getMachineBuild() in ('gbmv200','u51','u52','u53','u532','u533','u54','u55','u56','u57','vuultimo4k','u5','u5pvr','h9','i55se','h9se','h9combo','h9combose','h10','alien5','cc1','sf8008','sf8008m','hd60','hd61','i55plus','ustym4kpro','beyonwizv2','viper4k','v8plus','vuduo4k','vuduo4kse','multibox','plus'): cores = 4 elif getMachineBuild() in ('u41','u42','u43'): cores = 1 diff --git a/lib/python/Components/Harddisk.py b/lib/python/Components/Harddisk.py index b528b2030a8..e5268cc56b8 100644 --- a/lib/python/Components/Harddisk.py +++ b/lib/python/Components/Harddisk.py @@ -790,7 +790,7 @@ def getBlockDevInfo(self, blockdev): error = False removable = False BLACKLIST=[] - if getMachineBuild() in ('gbmv200','multibox','plus','h9combo','h10','v8plus','hd60','hd61','vuduo4k','ustym4kpro','beyonwizv2','viper4k','dags72604','u51','u52','u53','u532','u533','u54','u56','u57','u5','u5pvr','cc1','sf8008','sf8008m','vuzero4k','et1x000','vuuno4k','vuuno4kse','vuultimo4k','vusolo4k','hd51','hd52','sf4008','dm900','dm7080','dm820', 'gb7252', 'gb72604', 'dags7252', 'vs1500','h7','8100s','et13000','sf5008'): + if getMachineBuild() in ('gbmv200','multibox','plus','i55se','h9se','h9combo','h9combose','h10','v8plus','hd60','hd61','vuduo4k','ustym4kpro','beyonwizv2','viper4k','dags72604','u51','u52','u53','u532','u533','u54','u56','u57','u5','u5pvr','cc1','sf8008','sf8008m','vuzero4k','et1x000','vuuno4k','vuuno4kse','vuultimo4k','vusolo4k','hd51','hd52','sf4008','dm900','dm7080','dm820', 'gb7252', 'gb72604', 'dags7252', 'vs1500','h7','8100s','et13000','sf5008'): BLACKLIST=["mmcblk0"] elif getMachineBuild() in ('xc7439','osmio4k','osmio4kplus','osmini4k'): BLACKLIST=["mmcblk1"] diff --git a/lib/python/Components/UsageConfig.py b/lib/python/Components/UsageConfig.py index 50fbefa3a18..cce24d641dd 100755 --- a/lib/python/Components/UsageConfig.py +++ b/lib/python/Components/UsageConfig.py @@ -1015,7 +1015,7 @@ def set12VOutput(configElement): config.network = ConfigSubsection() if SystemInfo["WakeOnLAN"]: def wakeOnLANChanged(configElement): - if getBoxType() in ('multibox','plus','hd61','hd60','h9twin','h9combo','h10','h9','et7000', 'et7100', 'et7500', 'gbx1', 'gbx2', 'gbx3', 'gbx3h', 'et10000', 'gbquadplus', 'gbquad', 'gb800ueplus', 'gb800seplus', 'gbultraue', 'gbultraueh', 'gbultrase', 'gbipbox', 'quadbox2400', 'mutant2400', 'et7x00', 'et8500', 'et8500s','hzero','h8'): + if getBoxType() in ('multibox','plus','hd61','hd60','h9twin','i55se','h9se','h9combo','h9combose','h10','h9','et7000', 'et7100', 'et7500', 'gbx1', 'gbx2', 'gbx3', 'gbx3h', 'et10000', 'gbquadplus', 'gbquad', 'gb800ueplus', 'gb800seplus', 'gbultraue', 'gbultraueh', 'gbultrase', 'gbipbox', 'quadbox2400', 'mutant2400', 'et7x00', 'et8500', 'et8500s','hzero','h8'): open(SystemInfo["WakeOnLAN"], "w").write(configElement.value and "on" or "off") else: open(SystemInfo["WakeOnLAN"], "w").write(configElement.value and "enable" or "disable") diff --git a/lib/python/Plugins/Extensions/Infopanel/MountManager.py b/lib/python/Plugins/Extensions/Infopanel/MountManager.py index cb5e9b12bad..9da98dfaf5a 100644 --- a/lib/python/Plugins/Extensions/Infopanel/MountManager.py +++ b/lib/python/Plugins/Extensions/Infopanel/MountManager.py @@ -101,7 +101,7 @@ def updateList2(self): device = parts[3] if not search('sd[a-z][1-9]',device) and not search('mmcblk[0-9]p[1-9]',device): continue - if getMachineBuild() in ('gbmv200','h9combo','h10','v8plus','hd60','hd61','vuduo4k','vuduo4kse','ustym4kpro','beyonwizv2','viper4k','sf8008','sf8008m','cc1','dags72604','u51','u52','u53','u532','u533','u54','u56','u57','vuzero4k','u5','sf5008','et13000','et1x000','vuuno4k','vuuno4kse', 'vuultimo4k', 'vusolo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'gb72604', 'dags7252', 'vs1500','h7','8100s') and search('mmcblk0p[1-9]',device): + if getMachineBuild() in ('gbmv200','i55se','h9se','h9combo','h9combose','h10','v8plus','hd60','hd61','vuduo4k','vuduo4kse','ustym4kpro','beyonwizv2','viper4k','sf8008','sf8008m','cc1','dags72604','u51','u52','u53','u532','u533','u54','u56','u57','vuzero4k','u5','sf5008','et13000','et1x000','vuuno4k','vuuno4kse', 'vuultimo4k', 'vusolo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'gb72604', 'dags7252', 'vs1500','h7','8100s') and search('mmcblk0p[1-9]',device): continue if getMachineBuild() in ('xc7439','osmio4k','osmio4kplus','osmini4k') and search('mmcblk1p[1-9]',device): continue @@ -417,7 +417,7 @@ def updateList(self): device = parts[3] if not search('sd[a-z][1-9]',device) and not search('mmcblk[0-9]p[1-9]',device): continue - if getMachineBuild() in ('gbmv200','multibox','plus','h9combo','h10','v8plus','hd60','hd61','vuduo4k','vuduo4kse','ustym4kpro','beyonwizv2','viper4k','sf8008','sf8008m','cc1','dags72604','u51','u52','u53','u532','u533','u54','u56','u57','vuzero4k','u5','sf5008','et13000','et1x000','vuuno4k','vuuno4kse', 'vuultimo4k', 'vusolo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'gb72604', 'dags7252', 'vs1500','h7','8100s') and search('mmcblk0p[1-9]',device): + if getMachineBuild() in ('gbmv200','multibox','plus','i55se','h9se','h9combo','h9combose','h10','v8plus','hd60','hd61','vuduo4k','vuduo4kse','ustym4kpro','beyonwizv2','viper4k','sf8008','sf8008m','cc1','dags72604','u51','u52','u53','u532','u533','u54','u56','u57','vuzero4k','u5','sf5008','et13000','et1x000','vuuno4k','vuuno4kse', 'vuultimo4k', 'vusolo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'gb72604', 'dags7252', 'vs1500','h7','8100s') and search('mmcblk0p[1-9]',device): continue if getMachineBuild() in ('xc7439','osmio4k','osmio4kplus','osmini4k') and search('mmcblk1p[1-9]',device): continue diff --git a/lib/python/Screens/About.py b/lib/python/Screens/About.py index b501ec1fab4..ebf7e82e41f 100644 --- a/lib/python/Screens/About.py +++ b/lib/python/Screens/About.py @@ -86,7 +86,7 @@ def getAboutText(): cpuMHz = _(" (1.5 GHz)") elif getMachineBuild() in ('formuler1tc','formuler1', 'triplex', 'tiviaraplus'): cpuMHz = _(" (1.3 GHz)") - elif getMachineBuild() in ('gbmv200','u51','u5','u53','u532','u533','u52','u54','u55','u56','u57','u5pvr','h9','h9combo','h10','cc1','sf8008','sf8008m','hd60','hd61','i55plus','ustym4kpro','beyonwizv2','viper4k','v8plus','multibox','plus'): + elif getMachineBuild() in ('gbmv200','u51','u5','u53','u532','u533','u52','u54','u55','u56','u57','u5pvr','h9','h9se','h9combo','h9combose','h10','cc1','sf8008','sf8008m','hd60','hd61','i55plus','i55se','ustym4kpro','beyonwizv2','viper4k','v8plus','multibox','plus'): cpuMHz = _(" (1.6 GHz)") elif getMachineBuild() in ('vuuno4kse','vuuno4k','dm900','dm920', 'gb7252', 'dags7252','xc7439','8100s'): cpuMHz = _(" (1.7 GHz)") diff --git a/lib/python/Screens/InputDeviceSetup.py b/lib/python/Screens/InputDeviceSetup.py index 3179944218f..99c63495ca5 100644 --- a/lib/python/Screens/InputDeviceSetup.py +++ b/lib/python/Screens/InputDeviceSetup.py @@ -364,7 +364,7 @@ class RemoteControlType(Screen, ConfigListScreen): ("25", _("Zgemma H8/H0/H9/I55Plus old Model")), ("26", _("Protek 4K UHD/HD61")), ("27", _("HD60")), - ("28", _("H7/H9/H9COMBO/H10 new Model")) + ("28", _("I55SE/H7/H9/H9SE/H9COMBO/H9COMBOSE/H10 new Model")) ] defaultRcList = [ ("default", 0), @@ -412,7 +412,10 @@ class RemoteControlType(Screen, ConfigListScreen): ("hd60", 27), ("h7", 28), # new model ("h9", 28), # new model + ("h9se", 28), # new model ("h9combo", 28), + ("h9combose", 28), + ("i55se", 28), ("h10", 28) ]