Skip to content

S10 fixes part1 #75

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

Merged
merged 8 commits into from
May 9, 2023
Merged

S10 fixes part1 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
21c27a2
Fix serial number detection
torbennehmer Apr 28, 2023
0879b31
Fix set_power_save return code detection
torbennehmer Apr 28, 2023
be2e55c
Add missing exports
torbennehmer Apr 28, 2023
0fe8588
Update AUTHORS
torbennehmer Apr 28, 2023
985be5b
Fix flake8 errors, trailing whitspace removed
torbennehmer Apr 30, 2023
c115a64
black formatting fixes
torbennehmer Apr 30, 2023
8daadb4
Fix handling of set_powersave
torbennehmer May 1, 2023
befe6f4
Fix linter errors (got lost while dissecting the branch)
torbennehmer May 8, 2023
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
3 changes: 2 additions & 1 deletion AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
* Steff @steff333
* is00709 @is00709
* Gregor Wolf @gregorwolf
* Max Dhom @mdhom
* Max Dhom @mdhom
* Torben Nehmer @torbennehmer
2 changes: 2 additions & 0 deletions e3dc/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
__all__ = [
"E3DC",
"AuthenticationError",
"NotAvailableError",
"PollError",
"SendError",
"CommunicationError",
"RSCPAuthenticationError",
"RSCPKeyError",
Expand Down
40 changes: 19 additions & 21 deletions e3dc/_e3dc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def _set_serial(self, serial):
self.pvis = self.pvis or [{"index": 0}]
if not self.serialNumberPrefix:
self.serialNumberPrefix = "S10-"
if self.serialNumber.startswith("74"):
elif self.serialNumber.startswith("74"):
self.model = "S10E_Compact"
self.powermeters = self.powermeters or [{"index": 0}]
self.pvis = self.pvis or [{"index": 0}]
Expand Down Expand Up @@ -1984,27 +1984,25 @@ def set_powersave(self, enable, keepAlive=False):
0 if success
-1 if error
"""
if enable:
res = self.sendRequest(
(
"EMS_REQ_SET_POWER_SETTINGS",
"Container",
[("EMS_POWERSAVE_ENABLED", "UChar8", 1)],
),
keepAlive=keepAlive,
)
else:
res = self.sendRequest(
(
"EMS_REQ_SET_POWER_SETTINGS",
"Container",
[("EMS_POWERSAVE_ENABLED", "UChar8", 0)],
),
keepAlive=keepAlive,
)
res = self.sendRequest(
(
"EMS_REQ_SET_POWER_SETTINGS",
"Container",
[("EMS_POWERSAVE_ENABLED", "UChar8", int(enable))],
),
keepAlive=keepAlive,
)

# validate return code for EMS_RES_POWERSAVE_ENABLED is 0
if res[2][0][2] == 0:
# Returns value of EMS_REQ_SET_POWER_SETTINGS, we get a success flag here,
# that we normalize and push outside.
# [ "EMS_SET_POWER_SETTINGS",
# "Container",
# [
# ["EMS_RES_POWERSAVE_ENABLED", "Char8", 0]
# ]
# ]

if rscpFindTagIndex(res, "EMS_RES_POWERSAVE_ENABLED") == 0:
return 0
else:
return -1
Expand Down