Skip to content

Commit

Permalink
clean zgemma brand
Browse files Browse the repository at this point in the history
  • Loading branch information
gimsy committed Oct 16, 2024
1 parent 9c9cd3e commit 0a5e01d
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 45 deletions.
14 changes: 7 additions & 7 deletions lib/python/Components/About.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ def _getCPUSpeedMhz():
return 1500
elif getMachineBuild() in ('formuler1tc', 'formuler1', 'triplex', 'tiviaraplus'):
return 1300
elif getMachineBuild() in ('dagsmv200', 'gbmv200', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'u5', 'u5pvr', 'h9', 'i55se', 'h9se', 'h9combose', 'h9combo', 'h10', 'h11', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'sx988', 'hd60', 'hd61', 'i55plus', 'ustym4kpro', 'ustym4kottpremium', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse'):
elif getMachineBuild() in ('dagsmv200', 'gbmv200', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'u5', 'u5pvr', 'i55se', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'sx988', 'hd60', 'hd61', 'i55plus', 'ustym4kpro', 'ustym4kottpremium', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse'):
return 1600
elif getMachineBuild() in ('vuuno4kse', 'vuuno4k', 'dm900', 'dm920', 'gb7252', 'dags7252', 'xc7439', '8100s'):
return 1700
elif getMachineBuild() in ('alien5', 'hzero', 'h8', 'sfx6008'):
return 2000
elif getMachineBuild() in ('vuduo4k',):
return 2100
elif getMachineBuild() in ('hd51', 'hd52', 'sf4008', 'vs1500', 'et1x000', 'h7', 'et13000', 'sf5008', 'osmio4k', 'osmio4kplus', 'osmini4k'):
elif getMachineBuild() in ('hd51', 'hd52', 'sf4008', 'vs1500', 'et1x000', 'et13000', 'sf5008', 'osmio4k', 'osmio4kplus', 'osmini4k'):
try:
return round(int(hexlify(open("/sys/firmware/devicetree/base/cpus/cpu@0/clock-frequency", "rb").read()), 16) / 1000000, 1)
except:
Expand Down Expand Up @@ -249,7 +249,7 @@ def getChipSetString():
return "73625"
elif getMachineBuild() in ('dm900', 'dm920', 'et13000', 'sf5008'):
return "7252S"
elif getMachineBuild() in ('hd51', 'vs1500', 'h7'):
elif getMachineBuild() in ('hd51', 'vs1500'):
return "7251S"
elif getMachineBuild() in ('alien5',):
return "S905D"
Expand Down Expand Up @@ -282,15 +282,15 @@ def getCPUSpeedString():
return _("%s GHz") % "1,5"
elif getMachineBuild() in ('formuler1tc', 'formuler1', 'triplex', 'tiviaraplus'):
return _("%s GHz") % "1,3"
elif getMachineBuild() in ('dagsmv200', 'gbmv200', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'u5', 'u5pvr', 'h9', 'i55se', 'h9se', 'h9combose', 'h9combo', 'h10', 'h11', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'i55plus', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse'):
elif getMachineBuild() in ('dagsmv200', 'gbmv200', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'u5', 'u5pvr', 'i55se', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'i55plus', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse'):
return _("%s GHz") % "1,6"
elif getMachineBuild() in ('vuuno4kse', 'vuuno4k', 'dm900', 'dm920', 'gb7252', 'dags7252', 'xc7439', '8100s'):
return _("%s GHz") % "1,7"
elif getMachineBuild() in ('alien5', 'hzero', 'h8'):
return _("%s GHz") % "2,0"
elif getMachineBuild() in ('vuduo4k',):
return _("%s GHz") % "2,1"
elif getMachineBuild() in ('hd51', 'hd52', 'sf4008', 'vs1500', 'et1x000', 'h7', 'et13000', 'sf5008', 'osmio4k', 'osmio4kplus', 'osmini4k'):
elif getMachineBuild() in ('hd51', 'hd52', 'sf4008', 'vs1500', 'et1x000', 'et13000', 'sf5008', 'osmio4k', 'osmio4kplus', 'osmini4k'):
try:
from binascii import hexlify
f = open('/sys/firmware/devicetree/base/cpus/cpu@0/clock-frequency', 'rb')
Expand Down Expand Up @@ -332,7 +332,7 @@ def getCPUArch():
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 ('dagsmv200', 'gbmv200', 'u41', 'u42', 'u43', 'u45', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'u5', 'u5pvr', 'h9', 'i55se', 'h9se', 'h9combose', 'h9combo', 'h10', 'h11', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'i55plus', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse', 'hzero', 'h8'):
elif getMachineBuild() in ('dagsmv200', 'gbmv200', 'u41', 'u42', 'u43', 'u45', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'u5', 'u5pvr', 'i55se', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'i55plus', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse', 'hzero'):
return "Hisilicon"
elif getMachineBuild() in ('alien5',):
return "AMlogic"
Expand Down Expand Up @@ -370,7 +370,7 @@ def getCpuCoresString():
if len(splitted) > 1:
splitted[1] = splitted[1].replace('\n', '')
if splitted[0].startswith("processor"):
if getMachineBuild() in ('dagsmv200', 'gbmv200', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'vuultimo4k', 'u5', 'u5pvr', 'h9', 'i55se', 'h9se', 'h9combose', 'h9combo', 'h10', 'h11', 'alien5', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'i55plus', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'vuduo4k', 'vuduo4kse', 'multibox', 'multiboxse'):
if getMachineBuild() in ('dagsmv200', 'gbmv200', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'vuultimo4k', 'u5', 'u5pvr', 'i55se', 'alien5', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'i55plus', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'vuduo4k', 'vuduo4kse', 'multibox', 'multiboxse'):
cores = 4
elif getMachineBuild() in ('u41', 'u42', 'u43', 'u45'):
cores = 1
Expand Down
4 changes: 2 additions & 2 deletions lib/python/Components/Lcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def standbyCounterChanged(configElement):


def InitLcd():
if MACHINEBUILD in ('gbx34k', 'force4', 'viperslim', 'lunix', 'lunix4k', 'purehdse', 'vipert2c', 'evoslimse', 'evoslimt2c', 'valalinux', 'tmtwin4k', 'tmnanom3', 'mbmicrov2', 'revo4k', 'force3uhd', 'force2nano', 'evoslim', 'ultrabox', 'novaip', 'dm520', 'dm525', 'purehd', 'mutant11', 'xpeedlxpro', 'zgemmai55', 'sf98', 'et7x00mini', 'xpeedlxcs2', 'xpeedlxcc', 'e4hd', 'e4hdhybrid', 'mbmicro', 'beyonwizt2', 'dynaspark', 'gb800se', 'gb800solo', 'gb800seplus', 'gbultrase', 'gbipbox', 'tmsingle', 'tmnano2super', 'iqonios300hd', 'iqonios300hdv2', 'optimussos1plus', 'optimussos1', 'vusolo', 'et4x00', 'et5x00', 'et6x00', 'et7000', 'et7100', 'gbx1', 'gbx2', 'gbx3', 'gbx3h'):
if MACHINEBUILD in ('gbx34k', 'force4', 'viperslim', 'lunix', 'lunix4k', 'purehdse', 'vipert2c', 'evoslimse', 'evoslimt2c', 'valalinux', 'tmtwin4k', 'tmnanom3', 'mbmicrov2', 'revo4k', 'force3uhd', 'force2nano', 'evoslim', 'ultrabox', 'novaip', 'dm520', 'dm525', 'purehd', 'mutant11', 'xpeedlxpro', 'sf98', 'et7x00mini', 'xpeedlxcs2', 'xpeedlxcc', 'e4hd', 'e4hdhybrid', 'mbmicro', 'beyonwizt2', 'dynaspark', 'gb800se', 'gb800solo', 'gb800seplus', 'gbultrase', 'gbipbox', 'tmsingle', 'tmnano2super', 'iqonios300hd', 'iqonios300hdv2', 'optimussos1plus', 'optimussos1', 'vusolo', 'et4x00', 'et5x00', 'et6x00', 'et7000', 'et7100', 'gbx1', 'gbx2', 'gbx3', 'gbx3h'):
detected = False
elif MACHINEBUILD in ('pulse4kmini',):
detected = True
Expand Down Expand Up @@ -486,7 +486,7 @@ def setXcoreVFD(configElement):
max_limit = 10
default_bright = 10

if MACHINEBUILD in ('novatwin', 'novacombo', 'zgemmas2s', 'zgemmash1', 'zgemmash2', 'zgemmass', 'zgemmahs', 'zgemmah2s', 'zgemmah2h', 'spycat'):
if MACHINEBUILD in ('novatwin', 'novacombo', 'spycat'):
max_limit = 4
default_bright = 4
elif MACHINEBUILD not in ("spycat4kmini", "osmega"):
Expand Down
2 changes: 1 addition & 1 deletion lib/python/Components/SystemInfo.py
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ def getWakeOnLANType(fileName):
BoxInfo.setItem("HasKexecMultiboot", fileHas("/proc/cmdline", "kexec=1"))
BoxInfo.setItem("cankexec", BoxInfo.getItem("kexecmb") and fileExists("/usr/bin/kernel_auto.bin") and fileExists("/usr/bin/STARTUP.cpio.gz") and not BoxInfo.getItem("HasKexecMultiboot"))
BoxInfo.setItem("CanNotDoSimultaneousTranscodeAndPIP", MODEL in ("vusolo4k", "gbquad4k", "gbquad4kpro", "gbue4k"))
BoxInfo.setItem("canRecovery", MODEL in ("hd51", "vs1500", "h7", "8100s") and ("disk.img", "mmcblk0p1") or MODEL in ("xc7439", "osmio4k", "osmio4kplus", "osmini4k") and ("emmc.img", "mmcblk1p1") or MODEL in ("gbmv200", "sf8008", "sf8008m", "sx988", "ip8", "ustym4kpro", "ustym4kottpremium", "ustym4ks2ottx", "beyonwizv2", "viper4k", "og2ott4k", "sx88v2", "sx888") and ("usb_update.bin", "none"))
BoxInfo.setItem("canRecovery", MODEL in ("hd51", "vs1500", "8100s") and ("disk.img", "mmcblk0p1") or MODEL in ("xc7439", "osmio4k", "osmio4kplus", "osmini4k") and ("emmc.img", "mmcblk1p1") or MODEL in ("gbmv200", "sf8008", "sf8008m", "sx988", "ip8", "ustym4kpro", "ustym4kottpremium", "ustym4ks2ottx", "beyonwizv2", "viper4k", "og2ott4k", "sx88v2", "sx888") and ("usb_update.bin", "none"))
BoxInfo.setItem("CanUse3DModeChoices", fileExists("/proc/stb/fb/3dmode_choices") and True or False)
#BoxInfo.setItem("ChipsetString", getChipsetString(), immutable=True)
BoxInfo.setItem("CIHelper", fileExists("/usr/bin/cihelper"))
Expand Down
2 changes: 1 addition & 1 deletion lib/python/OPENDROID/HddSetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -867,7 +867,7 @@ def quit(self):
except:
pass

arm_box = MODEL_NAME in ('sf5008','et13000','et1x000','uno4k', 'ultimo4k', 'solo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'dags7252', 'vs1500','h7','8100s')
arm_box = MODEL_NAME in ('sf5008','et13000','et1x000','uno4k', 'ultimo4k', 'solo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'dags7252', 'vs1500','8100s')

class Disks:
ptypes = {'0': 'Empty',
Expand Down
4 changes: 2 additions & 2 deletions lib/python/OPENDROID/MountManager.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,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 ('multibox', 'multiboxse', 'dagsmv200', 'gbmv200', 'i55se', 'h9se', 'h9combose', 'h9combo', 'h10', 'h11', 'v8plus', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'vuduo4k', 'vuduo4kse', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'sf8008', 'sf8008m', 'sf8008opt', 'cc1', 'dags72604', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u56', 'u57', 'u571', '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 ('multibox', 'multiboxse', 'dagsmv200', 'gbmv200', 'i55se', 'h9se', 'v8plus', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'vuduo4k', 'vuduo4kse', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'sf8008', 'sf8008m', 'sf8008opt', 'cc1', 'dags72604', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u56', 'u57', 'u571', 'vuzero4k', 'u5', 'sf5008', 'et13000', 'et1x000', 'vuuno4k', 'vuuno4kse', 'vuultimo4k', 'vusolo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'gb72604', 'dags7252', 'vs1500', '8100s') and search('mmcblk0p[1-9]', device):
continue
if getMachineBuild() in ('xc7439', 'osmio4k', 'osmio4kplus', 'osmini4k') and search('mmcblk1p[1-9]', device):
continue
Expand Down Expand Up @@ -423,7 +423,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 ('dagsmv200', 'gbmv200', 'multibox', 'multiboxse', 'i55se', 'h9se', 'h9combose', 'h9combo', 'h10', 'h11', 'v8plus', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'vuduo4k', 'vuduo4kse', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'sf8008', 'sf8008m', 'sf8008opt', 'cc1', 'dags72604', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u56', 'u57', 'u571', '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 ('dagsmv200', 'gbmv200', 'multibox', 'multiboxse', 'i55se', 'h9se', 'v8plus', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'vuduo4k', 'vuduo4kse', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'sf8008', 'sf8008m', 'sf8008opt', 'cc1', 'dags72604', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u56', 'u57', 'u571', 'vuzero4k', 'u5', 'sf5008', 'et13000', 'et1x000', 'vuuno4k', 'vuuno4kse', 'vuultimo4k', 'vusolo4k', 'hd51', 'hd52', 'dm820', 'dm7080', 'sf4008', 'dm900', 'dm920', 'gb7252', 'gb72604', 'dags7252', 'vs1500', '8100s') and search('mmcblk0p[1-9]', device):
continue
if getMachineBuild() in ('xc7439', 'osmio4k', 'osmio4kplus', 'osmini4k') and search('mmcblk1p[1-9]', device):
continue
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,7 @@ def initDestination(destination):
cmdlist.append('echo "This file forces a reboot after the update." > %s/reboot.update' % self.MAINDEST)
elif self.MODEL in ("vuzero", "vusolose", "vuuno4k", "vuzero4k"):
cmdlist.append('echo "This file forces the update." > %s/force.update' % self.MAINDEST)
elif self.MODEL in ("viperslim", "evoslimse", "evoslimt2c", "novaip", "zgemmai55", "sf98", "xpeedlxpro", "evoslim", "vipert2c"):
elif self.MODEL in ("viperslim", "evoslimse", "evoslimt2c", "novaip", "sf98", "xpeedlxpro", "evoslim", "vipert2c"):
cmdlist.append('echo "This file forces the update." > %s/force' % self.MAINDEST)
elif self.ROOTFSSUBDIR != "none":
cmdlist.append('echo "Rename the unforce_%s.txt to force_%s.txt and move it to the root of your usb-stick" > %s/force_%s_READ.ME' % (self.MACHINEBUILD, self.MACHINEBUILD, self.MAINDEST, self.MACHINEBUILD))
Expand Down
8 changes: 4 additions & 4 deletions lib/python/Screens/About.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def freeflash():
cpuMHz = _(" (2.0 GHz)")
elif getMachineBuild() in ('vuduo4k', ):
cpuMHz = _(" (2.1 GHz)")
elif getMachineBuild() in ('sf5008', 'et13000', 'et1x000', 'hd52', 'hd51', 'sf4008', 'vs1500', 'h7', 'osmio4k', 'osmio4kplus', 'osmini4k'):
elif getMachineBuild() in ('sf5008', 'et13000', 'et1x000', 'hd52', 'hd51', 'sf4008', 'vs1500', 'osmio4k', 'osmio4kplus', 'osmini4k'):
try:
import binascii
f = open('/sys/firmware/devicetree/base/cpus/cpu@0/clock-frequency', 'rb')
Expand Down Expand Up @@ -253,16 +253,16 @@ def freeflash():
if res2:
bogoMIPS = "" + res2.replace("\n", "")

if getMachineBuild() in ('vusolo4k', 'hd51', 'hd52', 'sf4008', 'dm900', 'h7', 'gb7252'):
if getMachineBuild() in ('vusolo4k', 'hd51', 'hd52', 'sf4008', 'dm900', 'gb7252'):
AboutText += _("CPU:\t%s") % about.getCPUString() + cpuMHz + "\n"
else:
AboutText += _("CPU:\t%s") % about.getCPUString() + " " + cpuMHz + "\n"
dMIPS = 0
if getMachineBuild() in ('vusolo4k', 'vuultimo4k'):
dMIPS = "10.500"
elif getMachineBuild() in ('hd52', 'hd51', 'sf4008', 'dm900', 'h7', 'gb7252'):
elif getMachineBuild() in ('hd52', 'hd51', 'sf4008', 'dm900', 'gb7252'):
dMIPS = "12.000"
if getMachineBuild() in ('vusolo4k', 'hd51', 'hd52', 'sf4008', 'dm900', 'h7', 'gb7252'):
if getMachineBuild() in ('vusolo4k', 'hd51', 'hd52', 'sf4008', 'dm900', 'gb7252'):
AboutText += _("DMIPS:\t") + dMIPS + "\n"
else:
AboutText += _("BogoMIPS:\t%s") % bogoMIPS + "\n"
Expand Down
27 changes: 2 additions & 25 deletions lib/python/Screens/InputDeviceSetup.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,6 @@ class RemoteControlType(Setup):
("17", "XP3000"),
("18", "F1/F3/F4/F4-TURBO/TRIPLEX"),
("19", "HD2400"),
("20", "Zgemma Star S/2S/H1/H2"),
("21", "Zgemma H.S/H.2S/H.2H/H5/H7"),
("500", "WWIO_BRE2ZE_TC"),
("501", "OCTAGON_SF4008"),
("502", "GIGABLUE Black"),
Expand Down Expand Up @@ -258,15 +256,10 @@ class RemoteControlType(Setup):
("17", "XP3000"),
("18", "F1/F3/F4/F4-TURBO/TRIPLEX"),
("19", "HD2400"),
("20", "Zgemma Star S/2S/H1/H2"),
("21", _("Zgemma H.S/H.2S/H.2H/H5/H7 old Model")),
("22", "Zgemma i55"),
("23", "WWIO 4K"),
("24", "Axas E4HD Ultra"),
("25", "Zgemma H8/H0/H9/I55Plus old Model"),
("26", "Protek 4K UHD/HD61"),
("27", "HD60/HD66SE/Multibox/Multiboxse/Multiboxpro"),
("28", _("I55SE/H7/H9/H9SE/H9COMBO/H9COMBOSE/H10/H11 new Model"))
("27", "HD60/HD66SE/Multibox/Multiboxse/Multiboxpro")
]
defaultRcList = [
("default", 0),
Expand Down Expand Up @@ -298,32 +291,16 @@ class RemoteControlType(Setup):
("triplex", 18),
("xp1000", 14),
("xp3000", 17),
("sh1", 20),
("h3", 21),
("h5", 21),
#("h7", 21),# old model
("i55", 22),
("bre2ze4k", 23),
("e4hd", 24),
#("h9", 25),# old model
("i55plus", 25),
("hzero", 25),
("h8", 25),
("protek4k", 26),
("hd61", 26),
("hd60", 27),
("hd66se", 27),
("multibox", 27),
("multiboxse", 27),
("multiboxpro", 27),
("h7", 28), # new model
("h9", 28), # new model
("h9se", 28), # new model
("h9combo", 28),
("h9combose", 28),
("i55se", 28),
("h10", 28),
("h11", 28)
("multiboxpro", 27)
]

def __init__(self, session):
Expand Down
2 changes: 0 additions & 2 deletions lib/python/StartEnigma.py
Original file line number Diff line number Diff line change
Expand Up @@ -704,8 +704,6 @@ def quietEmit(self, eventDict):

if DISPLAYBRAND == "Atto.TV":
defaultLocale = "pt_BR"
elif DISPLAYBRAND == "Zgemma":
defaultLocale = "en_US"
elif DISPLAYBRAND == "Beyonwiz":
defaultLocale = "en_AU"
else:
Expand Down

0 comments on commit 0a5e01d

Please sign in to comment.