Mysensors: Refactor s_types and v_types mapping #1034
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -125,7 +124,8 @@ def mysensors_callback(gateway, node_id): | |||
| for child in gateway.sensors[node_id].children.values(): | |||
| for value_type in child.values.keys(): | |||
| key = node_id, child.id, value_type | |||
| if child.type not in s_types or value_type not in v_types: | |||
| if child.type not in map_sv_types or \ | |||
There was a problem hiding this comment.
You're using a defaultdict so there is no need to test if child.type in map_sv_types
There was a problem hiding this comment.
Actually, not a single assumption in your code seems to use the fact that you're using a defaultdict.
There was a problem hiding this comment.
Yes, I came to the same conclusion after a nights sleep. I'll change to a regular dict of lists. That way, I don't have to worry about mutating the map by accident, eg when checking membership.
8000
|
It looks fine 🐬 . Merge when you're happy about it. |
To be able to handle new platforms with multiple used v_types but single states, a new more strict mapping was required. Each s_type is now mapped to its corresponding v_type(s) in a dict of lists.
cf4d907 to
9db0987
Compare
|
Changed the defaultdict(list) for a regular dict of lists. Merging. |
MartinHjelmare
added a commit
that referenced
this pull request
Jan 30, 2016
Mysensors: Refactor s_types and v_types mapping
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To be able to handle new platforms with multiple used v_types but
single states, a new more strict mapping was required. Each s_type is
now mapped to its corresponding v_type(s) with a defaultdict(list).