Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Include edid info for DREAMNEXTGEN #3459

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −2
Draft

Include edid info for DREAMNEXTGEN #3459

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73a00b4
Include edid info for DREAMNEXTGEN
thestormbreaker Nov 28, 2024
7d76778
missing brackets
thestormbreaker Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/python/Components/SystemInfo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ def getWakeOnLANType(fileName):
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("HAVEEDIDDECODE", fileCheck("/proc/stb/hdmi/raw_edid") or fileCheck("/sys/class/amhdmitx/amhdmitx0/rawedid") and fileCheck("/usr/bin/edid-decode"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I this is wrong.

>>> True or False and False
True

You need extra brackets.

>>> (True or False) and False
False

BoxInfo.setItem("HaveID", fileCheck("/etc/.id"))
BoxInfo.setItem("HAVEINITCAM", hasInitCam())
BoxInfo.setItem("HAVEINITCARDSERVER", hasInitCardServer())
Expand Down
9 changes: 8 additions & 1 deletion lib/python/Screens/Information.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,8 +2079,15 @@ def __init__(self, session):
("Mounted Volumes", ("/bin/mount", "/bin/mount"), None),
("Partition Table", None, "/proc/partitions")
]

if isfile("/proc/stb/hdmi/raw_edid"):
edid_path = "/proc/stb/hdmi/raw_edid"
elif isfile("/sys/class/amhdmitx/amhdmitx0/rawedid"):
edid_path = "/sys/class/amhdmitx/amhdmitx0/rawedid"
else:
edid_path = None
if BoxInfo.getItem("HAVEEDIDDECODE"):
self.systemCommands.append(("EDID", ("/usr/bin/edid-decode", "/usr/bin/edid-decode", "/proc/stb/hdmi/raw_edid"), None))
self.systemCommands.append(("EDID", ("/usr/bin/edid-decode", "/usr/bin/edid-decode", edid_path), None))
self.systemCommandsIndex = 0
self.systemCommandsMax = len(self.systemCommands)
self.info = None
Expand Down