importing uic z-wave/main

NEWS.md

@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 **Full Changelog**:
 https://github.com/SiliconLabsSoftware/z-wave-protocol-controller/commits
 
+## ver_1.6.1-RC0
+
+Integrate internal changes progressively:
+
+applications/zpc: uic#ver_1.7.0-unstable-84-gcb000bc912
+applications/zpc/components/zwave/zwave_transports/s2/libs/zw-libs2: zw-libs2#zwave-sdk-7.21.0-ga-65-g3b7dcd7
+
 ## ver_1.6.0-RC4
 
 This tag was added once CI was able to produce unsupported binaries:

applications/zpc/Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
     "components/zwave_rust_proc_macros",

applications/zpc/components/Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 
 members = [
     "zwave_rust_proc_macros",

applications/zpc/components/dotdot_mapper/rules/OnOff_cluster_simulation.uam

@@ -33,14 +33,6 @@ def zbON_OFF_CLUSTER_StartUpOnOff       0x00064003
 def zbLEVEL_CLUSTER_LEVEL               0x00080000
 
 scope 0 chain_reaction(1) clear_desired(0) {
-  r'zbON_OFF_CLUSTER_OnTime = if e'zbON_OFF 0 undefined
-  r'zbON_OFF_CLUSTER_OffWaitTime = if e'zbON_OFF 0 undefined
-  r'zbON_OFF_CLUSTER_StartUpOnOff = if e'zbON_OFF 0 undefined
-
-  r'zbON_OFF_CLUSTER_GlobalSceneControl = if (
-    ( e'zbON_OFF & e'zbLEVEL_CLUSTER_LEVEL ) &
-    (1==r'zbON_OFF)) 1 undefined
-
   // When simulating, the Reported value always follows the desired value.
   // If no desired exist, start with value 1
   r'zbON_OFF = if (simulate_on_off) (d'zbON_OFF or 1) undefined

applications/zpc/components/rust_command_class_frame_types/build.rs

@@ -11,30 +11,23 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 use std::env;
-use std::path::PathBuf;
 use std::process::Command;
 
 fn main() {
     let out_dir = env::var_os("OUT_DIR").unwrap();
     //TODO I'm not quite sure how to set this in a nice way
     //env::var_os("XML_FILE").unwrap();
-    let xml = PathBuf::from("../zwave_command_classes/assets/ZWave_custom_cmd_classes.xml");
-    assert!(xml.exists());
+    let xml_file = "../zwave_command_classes/assets/ZWave_custom_cmd_classes.xml";
 
-    let py = PathBuf::from("zwave_rust_cc_gen.py");
-    assert!(py.exists());
-
-    which::which("python3").expect("Python was not found");
-    let _ = Command::new("python3")
-        .arg(py.to_str().unwrap())
+    Command::new("python3")
+        .arg("zwave_rust_cc_gen.py")
         .arg("--xml")
-        .arg(&xml.to_str().unwrap())
+        .arg(&xml_file)
         .arg("--outdir")
         .arg(&out_dir)
-        .output()
-        .expect(&format!("Failed to run python script {}", py.display()));
-    // println!("cargo:rerun-if-changed=zwave_rust_cc_gen.py");
-    println!("cargo:rerun-if-changed={}", py.to_str().unwrap());
+        .status()
+        .unwrap();
+    println!("cargo:rerun-if-changed=zwave_rust_cc_gen.py");
     // there is an fingerprinting bug in cargo, the path is constructed wrong triggering rebuilds of this package
     // println!("cargo:rerun-if-changed={:?}", &format!("{}/{}",std::env::var("CARGO_MANIFEST_DIR").unwrap(), xml_file));
 }

applications/zpc/components/rust_command_class_frame_types/zwave_rust_cc_gen.py

@@ -5,7 +5,7 @@
 
 
 ################################# Generic name handling #########################
-fix_chars = re.compile("[^0-9a-z]")
+fix_chars = re.compile(r"[^0-9a-z]")
 ns = ''
 
 

applications/zpc/components/ucl_mqtt/src/zpc_node_state.cpp

@@ -49,7 +49,7 @@ static sl_status_t ucl_node_state_discover_neighbors_command(
   dotdot_endpoint_id_t endpoint,
   uic_mqtt_dotdot_callback_call_type_t callback_type)
 {
-  if (true == is_zpc_unid(unid)) {
+  if (is_zpc_unid(unid)) {
     return SL_STATUS_NOT_SUPPORTED;
   }
 
@@ -90,7 +90,7 @@ static sl_status_t ucl_node_state_remove_offline_command(
   dotdot_endpoint_id_t endpoint,
   uic_mqtt_dotdot_callback_call_type_t callback_type)
 {
-  if (true == is_zpc_unid(unid)) {
+  if (is_zpc_unid(unid)) {
     return SL_STATUS_NOT_SUPPORTED;
   }
 
@@ -132,7 +132,7 @@ static sl_status_t ucl_node_state_interview_command(
   dotdot_endpoint_id_t endpoint,
   uic_mqtt_dotdot_callback_call_type_t callback_type)
 {
-  if (true == is_zpc_unid(unid)) {
+  if (is_zpc_unid(unid)) {
     return SL_STATUS_NOT_SUPPORTED;
   }
 
@@ -170,7 +170,7 @@ static sl_status_t ucl_node_state_discover_security_command(
   dotdot_endpoint_id_t endpoint,
   uic_mqtt_dotdot_callback_call_type_t callback_type)
 {
-  if (true == is_zpc_unid(unid)) {
+  if (is_zpc_unid(unid)) {
     return SL_STATUS_NOT_SUPPORTED;
   }
 
@@ -199,6 +199,48 @@ static sl_status_t ucl_node_state_discover_security_command(
                                                    : SL_STATUS_NOT_SUPPORTED;
 }
 
+/**
+ * @brief Performs an enable NLS operation for a Unid/Endpoint
+ *
+ * @param unid          UNID of the node to attempt to enable NLS
+ * @param endpoint      Endpoint of the node. The State topic does not support
+ *                      endpoints so this variable will be ignored.
+ *                      is performed on a NodeID level, as all endpoints share the same radio.
+ * @param callback_type  Dotdot MQTT Callback type
+ *
+ * @returns SL_STATUS_OK/SL_STATUS_FAIL to indicate support if callback_type is set to UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK
+ * sl_status_t code indicating the outcome of applying the command if callback_type is set to UIC_MQTT_DOTDOT_CALLBACK_TYPE_NORMAL
+*/
+static sl_status_t ucl_node_state_enable_nls_command(
+  const dotdot_unid_t unid,
+  dotdot_endpoint_id_t endpoint,
+  uic_mqtt_dotdot_callback_call_type_t callback_type)
+{
+  if (is_zpc_unid(unid)) {
+    return SL_STATUS_NOT_SUPPORTED;
+  }
+
+  if (UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK == callback_type) {
+    // Enable NLS always supported unless the node is offline/unavailable
+    NodeStateNetworkStatus network_status = unify_attribute_store_node_state_get_status(
+      attribute_store_network_helper_get_node_id_node(unid)
+    );
+
+    sl_status_t support = SL_STATUS_OK;
+    if ((network_status == ZCL_NODE_STATE_NETWORK_STATUS_OFFLINE)
+        || (network_status == ZCL_NODE_STATE_NETWORK_STATUS_UNAVAILABLE)) {
+      support = SL_STATUS_FAIL;
+    }
+    return support;
+  }
+
+  zwave_node_id_t node_id = 0x00;
+  if (SL_STATUS_OK == zwave_unid_to_node_id(unid, &node_id)) {
+    return zwave_store_nls_state(node_id, true, DESIRED_ATTRIBUTE);
+  }
+  return SL_STATUS_OK;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Init function shared with the component.
 //////////////////////////////////////////////////////////////////////////////
@@ -216,5 +258,8 @@ sl_status_t zpc_node_state_init()
   uic_mqtt_dotdot_state_discover_security_callback_set(
     &ucl_node_state_discover_security_command);
 
+  uic_mqtt_dotdot_state_enable_nls_callback_set(
+    &ucl_node_state_enable_nls_command);
+
   return SL_STATUS_OK;
 }

applications/zpc/components/ucl_mqtt/test/zpc_node_state_test.c

@@ -48,6 +48,9 @@ static uic_mqtt_dotdot_state_interview_callback_t interview_command = NULL;
 static uic_mqtt_dotdot_state_discover_security_callback_t
   discover_security_command
   = NULL;
+static uic_mqtt_dotdot_state_enable_nls_callback_t
+  enable_nls_command
+  = NULL;
 
 // Stub functions
 static void uic_mqtt_dotdot_state_remove_offline_callback_set_stub(
@@ -78,6 +81,13 @@ static void uic_mqtt_dotdot_state_discover_security_callback_set_stub(
   discover_security_command = callback;
 }
 
+static void uic_mqtt_dotdot_state_enable_nls_callback_set_stub(
+  const uic_mqtt_dotdot_state_enable_nls_callback_t callback,
+  int cmock_num_calls)
+{
+  enable_nls_command = callback;
+}
+
 /// Setup the test suite (called once before all test_xxx functions are called)
 void suiteSetUp()
 {
@@ -102,6 +112,7 @@ void setUp()
   discover_neighbors_command = NULL;
   interview_command          = NULL;
   discover_security_command  = NULL;
+  enable_nls_command         = NULL;
 
   // Always respond with HomeID / NodeID from the simulated network
   zwave_network_management_get_node_id_IgnoreAndReturn(zpc_node_id);
@@ -123,6 +134,9 @@ void setUp()
   uic_mqtt_dotdot_state_discover_security_callback_set_Stub(
     uic_mqtt_dotdot_state_discover_security_callback_set_stub);
 
+  uic_mqtt_dotdot_state_enable_nls_callback_set_Stub(
+    uic_mqtt_dotdot_state_enable_nls_callback_set_stub);
+
   // Call init
   TEST_ASSERT_EQUAL(SL_STATUS_OK, zpc_node_state_init());
 
@@ -131,6 +145,7 @@ void setUp()
   TEST_ASSERT_NOT_NULL(discover_neighbors_command);
   TEST_ASSERT_NOT_NULL(interview_command);
   TEST_ASSERT_NOT_NULL(discover_security_command);
+  TEST_ASSERT_NOT_NULL(enable_nls_command);
 }
 
 /// Called after each and every test
@@ -218,3 +233,72 @@ void test_discover_security_command()
                               UIC_MQTT_DOTDOT_CALLBACK_TYPE_NORMAL));
   TEST_ASSERT_TRUE(attribute_store_is_reported_defined(granted_keys_node));
 }
+
+void test_enable_nls_support_check()
+{
+  // Set our node to online functional
+  NodeStateNetworkStatus network_status
+    = ZCL_NODE_STATE_NETWORK_STATUS_ONLINE_FUNCTIONAL;
+  attribute_store_set_child_reported(node_id_node,
+                                     DOTDOT_ATTRIBUTE_ID_STATE_NETWORK_STATUS,
+                                     &network_status,
+                                     sizeof(network_status));
+
+  // Enable NLS should be supported:
+  TEST_ASSERT_EQUAL(
+    SL_STATUS_OK,
+    enable_nls_command(supporting_node_unid,
+                       endpoint_id,
+                       UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK));
+
+  // Offline should not show this state command
+  network_status = ZCL_NODE_STATE_NETWORK_STATUS_OFFLINE;
+  attribute_store_set_child_reported(node_id_node,
+                                     DOTDOT_ATTRIBUTE_ID_STATE_NETWORK_STATUS,
+                                     &network_status,
+                                     sizeof(network_status));
+  TEST_ASSERT_EQUAL(
+    SL_STATUS_FAIL,
+    enable_nls_command(supporting_node_unid,
+                       endpoint_id,
+                       UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK));
+
+  // Unavailable should not show this state command
+  network_status = ZCL_NODE_STATE_NETWORK_STATUS_UNAVAILABLE;
+  attribute_store_set_child_reported(node_id_node,
+                                     DOTDOT_ATTRIBUTE_ID_STATE_NETWORK_STATUS,
+                                     &network_status,
+                                     sizeof(network_status));
+  TEST_ASSERT_EQUAL(
+    SL_STATUS_FAIL,
+    enable_nls_command(supporting_node_unid,
+                       endpoint_id,
+                       UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK));
+
+  // ZPC SHOULD not support this state command either
+  network_status = ZCL_NODE_STATE_NETWORK_STATUS_ONLINE_FUNCTIONAL;
+  attribute_store_set_child_reported(zpc_node_id_node,
+                                     DOTDOT_ATTRIBUTE_ID_STATE_NETWORK_STATUS,
+                                     &network_status,
+                                     sizeof(network_status));
+  TEST_ASSERT_EQUAL(
+    SL_STATUS_NOT_SUPPORTED,
+    enable_nls_command(zpc_unid,
+                       zpc_endpoint_id,
+                       UIC_MQTT_DOTDOT_CALLBACK_TYPE_SUPPORT_CHECK));
+}
+
+void test_enable_nls_command()
+{
+  attribute_store_node_t target_node
+    = attribute_store_add_node(ATTRIBUTE_ZWAVE_NLS_STATE, node_id_node);
+  attribute_store_set_reported_number(target_node, 0);
+  attribute_store_set_desired_number(target_node, 0);
+
+  TEST_ASSERT_EQUAL(SL_STATUS_OK,
+                    enable_nls_command(supporting_node_unid,
+                                       endpoint_id,
+                                       UIC_MQTT_DOTDOT_CALLBACK_TYPE_NORMAL));
+  TEST_ASSERT_EQUAL(0, attribute_store_get_reported_number(target_node));
+  TEST_ASSERT_EQUAL(1, attribute_store_get_desired_number(target_node));
+}

applications/zpc/components/zpc_attribute_store/CMakeLists.txt

@@ -6,7 +6,10 @@ add_library(
   src/zpc_attribute_store_register_default_attribute_type_data.cpp
   src/zpc_attribute_store_type_registration.cpp
   src/zwave_association_toolbox.cpp
-  src/zwave_utils.c)
+  src/zwave_utils.c
+  src/zwave_frame_parser.cpp
+  src/zwave_frame_generator.cpp
+  )
 
 target_include_directories(
   zpc_attribute_store