Skip to content

GH-20: Fix support for COMMAND_CLASS_METER V1,V2 & V3 #11

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

GH-20: Fix support for COMMAND_CLASS_METER V1,V2 & V3 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db3a8e6
GH-20: Fix support for COMMAND_CLASS_METER V1,V2 & V3
nkljajic Nov 28, 2023
8acd3a1
GH-14: Enable testing by default
rzr Nov 9, 2023
dd870bd
GH-20: zpc: meter: Adjust tests to select matching versions of CC
rzr Jan 16, 2024
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
21 changes: 16 additions & 5 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 <= 3) {
*frame_length = sizeof(ZW_METER_GET_V3_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;
get_frame->cmdClass = COMMAND_CLASS_METER_V6;
ZW_METER_GET_FRAME *get_frame = (ZW_METER_GET_FRAME *)frame;
get_frame->cmdClass = COMMAND_CLASS_METER;
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
23 changes: 20 additions & 3 deletions ...ations/zpc/components/zwave_command_classes/test/zwave_command_class_meter_control_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ void test_meter_supported_get_v1()
{
// Simulate a version 1 node.
attribute_store_node_t version_node = attribute_store_add_node(
ZWAVE_CC_VERSION_ATTRIBUTE(COMMAND_CLASS_METER_V5),
ZWAVE_CC_VERSION_ATTRIBUTE(COMMAND_CLASS_METER),
endpoint_id_node);

const zwave_cc_version_t version = 1;
Expand All @@ -270,7 +270,7 @@ void test_meter_supported_get_v1()
received_frame,
&received_frame_size);

const uint8_t expected_frame[] = {COMMAND_CLASS_METER_V5, METER_GET, 0, 0};
const uint8_t expected_frame[] = {COMMAND_CLASS_METER, METER_GET};
TEST_ASSERT_EQUAL(sizeof(expected_frame), received_frame_size);
TEST_ASSERT_EQUAL_UINT8_ARRAY(expected_frame,
received_frame,
Expand Down Expand Up @@ -307,6 +307,15 @@ void test_meter_supported_get_v2()

void test_meter_get_low_scale()
{
// Simulate a version 2 node.
attribute_store_node_t version_node = attribute_store_add_node(
ZWAVE_CC_VERSION_ATTRIBUTE(COMMAND_CLASS_METER_V2),
endpoint_id_node);

const zwave_cc_version_t version = 2;
attribute_store_set_reported(version_node, &version, sizeof(version));


attribute_store_node_t meter_type_node
= attribute_store_add_node(ATTRIBUTE(TYPE), endpoint_id_node);
const meter_type_t type = 3;
Expand All @@ -328,7 +337,7 @@ void test_meter_get_low_scale()
meter_get(value_node, received_frame, &received_frame_size));

const uint8_t expected_frame[]
= {COMMAND_CLASS_METER_V5, METER_GET, (rate_type << 6) | (scale << 3), 0};
= {COMMAND_CLASS_METER_V2, METER_GET_V2, (rate_type << 6) | (scale << 3)};
TEST_ASSERT_EQUAL(sizeof(expected_frame), received_frame_size);
TEST_ASSERT_EQUAL_UINT8_ARRAY(expected_frame,
received_frame,
Expand All @@ -337,6 +346,14 @@ void test_meter_get_low_scale()

void test_meter_get_high_scale()
{
// Simulate a version 4 node.
attribute_store_node_t version_node = attribute_store_add_node(
ZWAVE_CC_VERSION_ATTRIBUTE(COMMAND_CLASS_METER_V4),
endpoint_id_node);

const zwave_cc_version_t version = 4;
attribute_store_set_reported(version_node, &version, sizeof(version));

attribute_store_node_t meter_type_node
= attribute_store_add_node(ATTRIBUTE(TYPE), endpoint_id_node);
const meter_type_t type = 1;
Expand Down
2 changes: 1 addition & 1 deletion helper.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ zpc/build: zpc/configure build
zpc/test: ${build_dir}/applications/zpc/components/zwave_command_classes/test/
ctest --test-dir ${<}

zpc/default: zpc/configure zpc/build
zpc/default: zpc/configure zpc/build zpc/test
@date -u

### @rootfs is faster than docker for env check
Expand Down