Skip to content

Commit

Permalink
add gbquad4kpro
Browse files Browse the repository at this point in the history
  • Loading branch information
@atvcaptain
atvcaptain committed Jul 24, 2024
1 parent 5512023 commit 05eec29
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
2 changes: 2 additions & 0 deletions lib/dvb/dvb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ eDVBResourceManager::eDVBResourceManager()
m_boxtype = GIGABLUE;
else if (!strncmp(tmp, "gbquad4k\n", rd))
m_boxtype = GIGABLUE;
else if (!strncmp(tmp, "gbquad4kpro\n", rd))
m_boxtype = GIGABLUE;
else if (!strncmp(tmp, "gbue4k\n", rd))
m_boxtype = GIGABLUE;
else if (!strncmp(tmp, "gbx34k\n", rd))
Expand Down
6 changes: 3 additions & 3 deletions lib/python/Components/AVSwitch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,7 +679,7 @@ def setAC3plusTranscode(configElement):
("hdmi_best", _("Use best / Controlled by HDMI")),
("force_ddp", _("Force AC3plus"))
]
elif MACHINEBUILD in ("gbquad4k", "gbue4k", "gbx34k"):
elif MACHINEBUILD in ("gbquad4k", "gbquad4kpro", "gbue4k", "gbx34k"):
choiceList = [
("downmix", _("Downmix")),
("passthrough", _("Pass-through")),
Expand Down Expand Up @@ -746,7 +746,7 @@ def setDTSDownmix(configElement):
BoxInfo.setItem("CanDownmixAAC", aacDownmix)
if aacDownmix:
def setAACDownmix(configElement):
value = configElement.value if MACHINEBUILD in ("dm900", "dm920", "dm7080", "dm800", "gbquad4k", "gbue4k", "gbx34k") else configElement.value and "downmix" or "passthrough"
value = configElement.value if MACHINEBUILD in ("dm900", "dm920", "dm7080", "dm800", "gbquad4k", "gbquad4kpro", "gbue4k", "gbx34k") else configElement.value and "downmix" or "passthrough"
fileWriteLine("/proc/stb/audio/aac", value, source=MODULE_NAME)

if MACHINEBUILD in ("dm900", "dm920", "dm7080", "dm800"):
Expand All @@ -756,7 +756,7 @@ def setAACDownmix(configElement):
("multichannel", _("Convert to multi-channel PCM")),
("hdmi_best", _("Use best / Controlled by HDMI"))
])
elif MACHINEBUILD in ("gbquad4k", "gbue4k", "gbx34k"):
elif MACHINEBUILD in ("gbquad4k", "gbquad4kpro", "gbue4k", "gbx34k"):
config.av.downmix_aac = ConfigSelection(default="downmix", choices=[
("downmix", _("Downmix")),
("passthrough", _("Pass-through")),
Expand Down
4 changes: 2 additions & 2 deletions lib/python/Components/SystemInfo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ def getWakeOnLANType(fileName):
BoxInfo.setItem("canMultiBoot", MultiBoot.getBootSlots())
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", "gbue4k"))
BoxInfo.setItem("CanNotDoSimultaneousTranscodeAndPIP", MODEL in ("vusolo4k", "gbquad4k", "gbquad4kpro", "gbue4k"))
BoxInfo.setItem("canRecovery", MODEL in ("hd51", "vs1500", "h7", "h17", "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", "og2s4k", "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)
Expand Down Expand Up @@ -414,7 +414,7 @@ def getWakeOnLANType(fileName):
BoxInfo.setItem("LcdLiveTV", fileCheck("/proc/stb/fb/sd_detach") or fileCheck("/proc/stb/lcd/live_enable"))
BoxInfo.setItem("LcdLiveTVPiP", fileCheck("/proc/stb/lcd/live_decoder"))
BoxInfo.setItem("LCDMiniTV", fileExists("/proc/stb/lcd/mode"))
BoxInfo.setItem("LCDMiniTVPiP", BoxInfo.getItem("LCDMiniTV") and MACHINEBUILD not in ("gb800ueplus", "gbquad4k", "gbue4k"))
BoxInfo.setItem("LCDMiniTVPiP", BoxInfo.getItem("LCDMiniTV") and MACHINEBUILD not in ("gb800ueplus", "gbquad4k", "gbquad4kpro", "gbue4k"))
BoxInfo.setItem("LCDSKINSetup", fileExists("/usr/share/enigma2/display") and DISPLAYTYPE not in ("7segment",))
BoxInfo.setItem("LEDButtons", MACHINEBUILD == "vuultimo")
BoxInfo.setItem("LEDColorControl", fileExists("/proc/stb/fp/led_color"))
Expand Down
6 changes: 3 additions & 3 deletions lib/python/Screens/AudioSelection.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def fillList(self, arg=None):
if BoxInfo.getItem("machinebuild") in ('dm900', 'dm920', 'dm7080', 'dm800'):
choice_list = [("downmix", _("Downmix")), ("passthrough", _("Pass-through")), ("multichannel", _("Convert to multi-channel PCM")), ("hdmi_best", _("Use best / Controlled by HDMI"))]
self.settings.downmix_aac = ConfigSelection(choices=choice_list, default=config.av.downmix_aac.value)
elif BoxInfo.getItem("machinebuild") in ('gbquad4k', 'gbue4k', 'gbx34k'):
elif BoxInfo.getItem("machinebuild") in ('gbquad4k', 'gbquad4kpro', 'gbue4k', 'gbx34k'):
choice_list = [("downmix", _("Downmix")), ("passthrough", _("Pass-through")), ("multichannel", _("Convert to multi-channel PCM")), ("force_ac3", _("Convert to AC3")), ("force_dts", _("Convert to DTS")), ("use_hdmi_cacenter", _("Use best / Controlled by HDMI")), ("wide", _("Wide")), ("extrawide", _("Extra wide"))]
self.settings.downmix_aac = ConfigSelection(choices=choice_list, default=config.av.downmix_aac.value)
else:
Expand All @@ -160,7 +160,7 @@ def fillList(self, arg=None):
if BoxInfo.getItem("machinebuild") in ('dm900', 'dm920', 'dm7080', 'dm800'):
choice_list = [("use_hdmi_caps", _("Controlled by HDMI")), ("force_ac3", _("Convert to AC3")), ("multichannel", _("Convert to multi-channel PCM")), ("hdmi_best", _("Use best / Controlled by HDMI")), ("force_ddp", _("Force AC3plus"))]
self.settings.transcodeac3plus = ConfigSelection(choices=choice_list, default=config.av.transcodeac3plus.value)
elif BoxInfo.getItem("machinebuild") in ('gbquad4k', 'gbue4k', 'gbx34k'):
elif BoxInfo.getItem("machinebuild") in ('gbquad4k', 'gbquad4kpro', 'gbue4k', 'gbx34k'):
choice_list = [("downmix", _("Downmix")), ("passthrough", _("Pass-through")), ("force_ac3", _("Convert to AC3")), ("multichannel", _("Convert to multi-channel PCM")), ("force_dts", _("Convert to DTS"))]
self.settings.transcodeac3plus = ConfigSelection(choices=choice_list, default=config.av.transcodeac3plus.value)
else:
Expand Down Expand Up @@ -416,7 +416,7 @@ def changePCMMultichannel(self, multichan):
self.fillList()

def changeAACDownmix(self, downmix):
if BoxInfo.getItem("machinebuild") in ('dm900', 'dm920', 'dm7080', 'dm800', 'gbquad4k', 'gbue4k', 'gbx34k'):
if BoxInfo.getItem("machinebuild") in ('dm900', 'dm920', 'dm7080', 'dm800', 'gbquad4k', 'gbquad4kpro', 'gbue4k', 'gbx34k'):
config.av.downmix_aac.setValue(downmix.value)
else:
if downmix.value:
Expand Down
4 changes: 2 additions & 2 deletions lib/python/Screens/ImageBackup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ def consoleCallback(result=None):
cmdLines.append(f"{self.syncCmd}")
# Create other image backup components.
boxName = BoxInfo.getItem("BoxName")
if boxName in ("gbquad4k", "gbue4k", "gbx34k"):
if boxName in ("gbquad4k", "gbquad4kpro", "gbue4k", "gbx34k"):
cmdLines.append(f"{self.echoCmd} \"Create boot dump.\"")
cmdLines.append(f"{self.ddCmd} if=/dev/mmcblk0p1 of={workDir}boot.bin")
cmdLines.append(f"{self.echoCmd} \"Create rescue dump.\"")
Expand Down Expand Up @@ -513,7 +513,7 @@ def consoleCallback(result=None):
cmdLines.append(f"{self.echoCmd} \"{"\n".join(lines)}\" > {mainDestination}force_{model}_READ.ME")
else:
cmdLines.append(f"{self.echoCmd} \"Rename this file to 'force' to force an update without confirmation.\" > {mainDestination}noforce")
if boxName in ("gbquad4k", "gbue4k", "gbx34k"):
if boxName in ("gbquad4k", "gbquad4kpro", "gbue4k", "gbx34k"):
cmdLines.append(f"{self.moveCmd} {workDir}boot.bin {mainDestination}")
cmdLines.append(f"{self.moveCmd} {workDir}rescue.bin {mainDestination}")
cmdLines.append(f"{self.copyCmd} -f /usr/share/gpt.bin {mainDestination}")
Expand Down

0 comments on commit 05eec29

Please sign in to comment.