GH-20: Fix support for COMMAND_CLASS_METER V1,V2 & V3 #20
Conversation
This file contains 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
rzr
reviewed
Nov 28, 2023
| @@ -205,13 +205,21 @@ static sl_status_t zwave_command_class_meter_get(attribute_store_node_t node, | |||
| attribute_store_node_t scale_node | |||
| = attribute_store_get_first_parent_with_type(rate_type_node, | |||
| ATTRIBUTE(SCALE)); | |||
| zwave_cc_version_t supporting_node_version | |||
| = zwave_command_class_get_version_from_node(node, COMMAND_CLASS_METER); | |||
|
|
|||
| meter_scale_t scale = 0; | |||
| attribute_store_get_reported(scale_node, &scale, sizeof(scale)); | |||
|
|
|||
| ZW_METER_GET_V5_FRAME *get_frame = (ZW_METER_GET_V5_FRAME *)frame; | |||
| get_frame->cmdClass = COMMAND_CLASS_METER_V6; | |||
There was a problem hiding this comment.
not related to you pr, but I would expect to have v6 frame to align the cmd class version maybe different ones will work but I bring confusion IMHO
There was a problem hiding this comment.
V6 is only locally defined
There was a problem hiding this comment.
Ok this should have been done differently, I'll see how to avoid this kind of duplication...
FTR at zwave we want to generate headers from xml file, unify should do same...
applications/zpc/components/zwave_command_classes/src/zwave_command_class_meter_control.c
Outdated
Show resolved
Hide resolved
Thomasdjb
reviewed
Nov 28, 2023
applications/zpc/components/zwave_command_classes/src/zwave_command_class_meter_control.c
Outdated
Show resolved
Hide resolved
nkljajic
force-pushed
the
fix-COMMAND_CLASS_METER_V1
branch
from
e981dce
to
db3a8e6
Compare
nkljajic
added a commit
to nkljajic/UnifySDK
that referenced
this pull request
Nov 28, 2023
Fixes bug where Attribute [0x3208] Value can not get resolved for legacy devices. Size of ZW_METER_GET_V3_FRAME is smaller than size of ZW_METER_GET_V5_FRAME. Legacy device supporting COMMAND_CLASS_METER_V3 and below will ignore received V5 frames, because frame size is larger than expected. Signed-off-by: Nenad Kljajic <nkljajic@control4.com>
Thomasdjb
approved these changes
Nov 29, 2023
rzr
approved these changes
Jan 15, 2024
There was a problem hiding this comment.
For the record related links:
Build: https://github.com/nkljajic/UnifySDK/actions/runs/7019839630/job/19098211543 : success
Forwarded-SiliconLabs: task/UIC-3082/phcoval/GH-20/develop
rzr
added a commit
to rzr/UnifySDK
that referenced
this pull request
Jan 16, 2024
…s of CC Bug-SiliconLabs: UIC-3082 Origin: https://github.com/rzr/UnifySDK/tree/GH-20/UIC-3082/phcoval/main Relate-to: nkljajic#1 Forwarded-SiliconLabs: task/UIC-3082/phcoval/SiliconLabsGH-20/develop Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
|
Blocked-by: nkljajic#1 This change should comes along test fixes as verified at: https://github.com/rzr/UnifySDK/actions/runs/7544676005/job/20538549227 |
nkljajic
added a commit
to nkljajic/UnifySDK
that referenced
this pull request
Jan 17, 2024
SiliconLabsGH-14: Enable testing by default
|
May your rebase on main to avoid the merge commit I confident it will be part of upcoming unify release Thank you for your contribution |
Fixes bug where Attribute [0x3208] Value can not get resolved for legacy devices. Size of ZW_METER_GET_V3_FRAME is smaller than size of ZW_METER_GET_V5_FRAME. Legacy device supporting COMMAND_CLASS_METER_V3 and below will ignore received V5 frames, because frame size is larger than expected. Signed-off-by: Nenad Kljajic <nkljajic@control4.com>
More to be tested Bug-SiliconLabs: UIC-3082 Bug-GitHub: rzr#3 Origin: https://github.com/rzr/UnifySDK/tree/GH-14/UIC-3082/phcoval/main Forwarded: SiliconLabs#26 Signed-off-by: Philippe Coval <philippe.coval@silabs.com> (cherry picked from commit 92f99dc) Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
…s of CC Bug-SiliconLabs: UIC-3082 Origin: https://github.com/rzr/UnifySDK/tree/GH-20/UIC-3082/phcoval/main Relate-to: #1 Forwarded-SiliconLabs: task/UIC-3082/phcoval/SiliconLabsGH-20/develop Signed-off-by: Philippe Coval <philippe.coval@silabs.com>
nkljajic
force-pushed
the
fix-COMMAND_CLASS_METER_V1
branch
from
653aa87
to
9c4b669
Compare
|
Origin-SiliconLabs: ver_1.5.0-unstable-79-g24f0d9eb1 |
agarwal57
pushed a commit
that referenced
this pull request
Feb 13, 2024
Fixes bug where Attribute [0x3208] Value can not get resolved for legacy devices. Size of ZW_METER_GET_V3_FRAME is smaller than size of ZW_METER_GET_V5_FRAME. Legacy device supporting COMMAND_CLASS_METER_V3 and below will ignore received V5 frames, because frame size is larger than expected. Signed-off-by: Nenad Kljajic <nkljajic@control4.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Change
Fixes bug where Attribute [0x3208] Value can not get resolved for legacy devices.
Size of ZW_METER_GET_V3_FRAME is smaller than size of ZW_METER_GET_V5_FRAME.
Legacy device supporting COMMAND_CLASS_METER_V3 and below will ignore received V5 frames,
because frame size is larger than expected.
Checklist