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

Attempt to decode command from packet #129

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Attempt to decode command from packet #129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a4545e
Attempt to decode command from packet
RavuAlHemio Dec 3, 2021
b8a1b69
Merge branch 'master' into decode-cmd-from-pkt
kipe Dec 19, 2021
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
15 changes: 14 additions & 1 deletion enocean/protocol/eep.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,11 @@ def find_profile(self, bitarray, eep_rorg, rorg_func, rorg_type, direction=None,
return None

profile = self.telegrams[eep_rorg][rorg_func][rorg_type]
eep_command = profile.find('command', recursive=False)

if command:
# multiple commands can be defined, with the command id always in same location (per RORG-FUNC-TYPE).
eep_command = profile.find('command', recursive=False)

# If commands are not set in EEP, or command is None,
# get the first data as a "best guess".
if not eep_command:
Expand All @@ -185,6 +186,18 @@ def find_profile(self, bitarray, eep_rorg, rorg_func, rorg_type, direction=None,
# If eep_command is defined, so should be data.command
return profile.find('data', {'command': str(command)}, recursive=False)

elif eep_command:
# no explicit command has been passed, but the EEP prescribes a command
# try to decode it from the packet
command_value = self._get_raw(eep_command, bitarray)

found_data = profile.find('data', {'command': str(command_value)}, recursive=False)
if found_data:
return found_data

# return the first hit as a best guess
return profile.find('data', recursive=False)

# extract data description
# the direction tag is optional
if direction is None:
Expand Down