Skip to content

Fix support for COMMAND_CLASS_METER V1,V2 & V3 #12

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

Closed
wants to merge 1 commit into from
Closed

Fix support for COMMAND_CLASS_METER V1,V2 & V3 #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 15 additions & 4 deletions applications/zpc/components/zwave_command_classes/src/zwave_command_class_meter_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
get_frame->cmd = METER_GET;

if (supporting_node_version == 1) {
*frame_length = sizeof(ZW_METER_GET_FRAME);
return SL_STATUS_OK;
}

// Insert the rate type into the frame:
get_frame->properties1 = (uint8_t)(rate_type << 6);
if (scale < 7) {
Expand All @@ -222,6 +230,11 @@ static sl_status_t zwave_command_class_meter_get(attribute_store_node_t node,
get_frame->scale2 = (uint8_t)(scale - 8);
}

if (supporting_node_version < 4) {
*frame_length = sizeof(ZW_METER_GET_V2_FRAME);
return SL_STATUS_OK;
}

*frame_length = sizeof(ZW_METER_GET_V5_FRAME);
return SL_STATUS_OK;
}
Expand All @@ -244,12 +257,10 @@ static sl_status_t zwave_command_class_meter_supported_get(
= zwave_command_class_get_version_from_node(node, COMMAND_CLASS_METER);

if (supporting_node_version == 1) {
ZW_METER_GET_V5_FRAME *get_frame = (ZW_METER_GET_V5_FRAME *)frame;
ZW_METER_GET_FRAME *get_frame = (ZW_METER_GET_FRAME *)frame;
get_frame->cmdClass = COMMAND_CLASS_METER_V6;
get_frame->cmd = METER_GET;
get_frame->properties1 = 0;
get_frame->scale2 = 0;
*frame_length = sizeof(ZW_METER_GET_V5_FRAME);
*frame_length = sizeof(ZW_METER_GET_FRAME);
return SL_STATUS_OK;
}

Expand Down