Skip to content

Commit

Permalink
clean
Browse files Browse the repository at this point in the history
  • Loading branch information
@gimsy
opendroid authored and gimsy committed Oct 20, 2024
1 parent c6c4265 commit 47c81a4
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 17 deletions.
4 changes: 0 additions & 4 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,10 +657,6 @@ if test "$BOXTYPE" == "ew7356" ; then
AC_DEFINE(KEY_PLAY_ACTUALLY_IS_KEY_PLAYPAUSE, 1,[define when rc sends a KEY_PLAY event for its KEY_PLAYPAUSE key])
fi

if test "$BOXTYPE" == "sh1" -o "$BOXTYPE" == "lc"; then
AC_DEFINE(KEY_PLAY_ACTUALLY_IS_KEY_PLAYPAUSE, 1,[define when rc sends a KEY_PLAY event for its KEY_PLAYPAUSE key])
fi

if test "$BOXTYPE" == "7000s" -o "$BOXTYPE" == "7100s" -o "$BOXTYPE" == "7105s" -o "$BOXTYPE" == "7200s" -o "$BOXTYPE" == "7205s" -o "$BOXTYPE" == "7210s" -o "$BOXTYPE" == "7215s" -o "$BOXTYPE" == "7300s" -o "$BOXTYPE" == "7400s"; then
AC_DEFINE(KEY_PLAY_ACTUALLY_IS_KEY_PLAYPAUSE, 1,[define when rc sends a KEY_PLAY event for its KEY_PLAYPAUSE key])
AC_DEFINE(LCD_COLOR_BITORDER_RGB565, 1,[define if lcd uses RGB565 bitorder])
Expand Down
4 changes: 2 additions & 2 deletions lib/python/Components/About.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def _getCPUSpeedMhz():
return 1600
elif getMachineBuild() in ('vuuno4kse', 'vuuno4k', 'dm900', 'dm920', 'gb7252', 'dags7252', 'xc7439', '8100s'):
return 1700
elif getMachineBuild() in ('alien5', 'hzero', 'sfx6008'):
elif getMachineBuild() in ('alien5', 'sfx6008'):
return 2000
elif getMachineBuild() in ('vuduo4k',):
return 2100
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', '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', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse', 'hzero'):
elif getMachineBuild() in ('dagsmv200', 'gbmv200', 'u41', 'u42', 'u43', 'u45', 'u51', 'u52', 'u53', 'u532', 'u533', 'u54', 'u55', 'u56', 'u57', 'u571', 'u5', 'u5pvr', 'cc1', 'sf8008', 'sf8008m', 'sf8008opt', 'hd60', 'hd61', 'pulse4k', 'pulse4kmini', 'ustym4kpro', 'beyonwizv2', 'viper4k', 'multibox', 'multiboxse'):
return "Hisilicon"
elif getMachineBuild() in ('alien5',):
return "AMlogic"
Expand Down
4 changes: 2 additions & 2 deletions lib/python/Components/InputDevice.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ def getDefaultKeyboardMap(self):
# locale = language.getLocale()
# if locale.startswith("de_") and "de.kmap" in self.keyboardMaps:
# return "de.kmap"
if BoxInfo.getItem("displaybrand") in ("Zgemma", "Atto.TV"):
if BoxInfo.getItem("displaybrand") in ("Atto.TV"):
return "us.kmap"
elif BoxInfo.getItem("displaybrand") == "Beyonwiz":
return "eng.kmap"
Expand All @@ -211,7 +211,7 @@ class RemoteControl:
knownCompatibleRemotes = [
("gb0", "gb1", "gb2", "gb3", "gb4"),
("ini0", "ini1", "ini2", "ini3", "ini4", "ini5", "ini6", "ini7", "ini8"),
("zgemma1", "zgemma2", "zgemma3", "zgemma4", "zgemma5", "zgemma6", "zgemma7", "evo6", "evo7")
("evo6", "evo7")
]

def __init__(self):
Expand Down
3 changes: 1 addition & 2 deletions lib/python/Components/SystemInfo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,12 +315,11 @@ def getWakeOnLANType(fileName):
BoxInfo.setItem("grautec", fileExists("/tmp/usbtft"))
BoxInfo.setItem("GraphicLCD", MACHINEBUILD in ("vuultimo", "xpeedlx3", "et10000", "mutant2400", "quadbox2400", "sezammarvel", "atemionemesis", "mbultra", "beyonwizt4", "osmio4kplus"))
BoxInfo.setItem("HasExternalPIP", MODEL not in ("et9x00", "et6x00", "et5x00") and fileCheck("/proc/stb/vmpeg/1/external"))
BoxInfo.setItem("HasFullHDSkinSupport", MACHINEBUILD not in ("et4000", "et5000", "sh1", "hd500c", "hd1100", "xp1000", "lc"))
BoxInfo.setItem("HasFullHDSkinSupport", MACHINEBUILD not in ("et4000", "et5000", "hd500c", "hd1100", "xp1000", "lc"))
BoxInfo.setItem("HasHiSi", pathExists("/proc/hisi"))
BoxInfo.setItem("hasPIPVisibleProc", fileCheck("/proc/stb/vmpeg/1/visible"))
BoxInfo.setItem("HasMMC", fileHas("/proc/cmdline", "root=/dev/mmcblk") or MultiBoot.canMultiBoot() and fileHas("/proc/cmdline", "root=/dev/sda"))
BoxInfo.setItem("HasSDmmc", MultiBoot.canMultiBoot() and "sd" in MultiBoot.getBootSlots()["2"] and "mmcblk" in MTDROOTFS)
BoxInfo.setItem("HasSDswap", MODEL in ("h9", "i55plus") and pathExists("/dev/mmcblk0p1"))
BoxInfo.setItem("HaveCISSL", fileCheck("/etc/ssl/certs/customer.pem") and fileCheck("/etc/ssl/certs/device.pem"))
BoxInfo.setItem("HAVEEDIDDECODE", fileCheck("/proc/stb/hdmi/raw_edid") and fileCheck("/usr/bin/edid-decode"))
BoxInfo.setItem("HaveID", fileCheck("/etc/.id"))
Expand Down
4 changes: 2 additions & 2 deletions lib/python/OPENDROID/MountManager.py
View file
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', '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):
if getMachineBuild() in ('multibox', 'multiboxse', 'dagsmv200', 'gbmv200', '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', '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):
if getMachineBuild() in ('dagsmv200', 'gbmv200', 'multibox', 'multiboxse', '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
5 changes: 0 additions & 5 deletions lib/python/Screens/InputDeviceSetup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,6 @@ class RemoteControlType(Setup):
("triplex", 18),
("xp1000", 14),
("xp3000", 17),
("sh1", 20),
("h3", 21),
("h5", 21),
("h7", 21),
("bre2ze_tc", 500),
("sf4008", 501),
("g100", 501),
Expand Down Expand Up @@ -293,7 +289,6 @@ class RemoteControlType(Setup):
("xp3000", 17),
("bre2ze4k", 23),
("e4hd", 24),
("hzero", 25),
("protek4k", 26),
("hd61", 26),
("hd60", 27),
Expand Down

0 comments on commit 47c81a4

Please sign in to comment.