uic: zpc: UIC-3597: Remove zwave_store_nls_support dependency from zwave_api module

(cherry picked from commit dc4aac75a507871e24f1dfd71dd7f1cdb6794167)
Forwarded: #11
Signed-off-by: Philippe Coval <philippe.coval@silabs.com>

Author: silabs-aydogane

applications/zpc/components/zpc_stdin/src/zpc_stdin_command_handling.cpp

@@ -881,13 +881,22 @@ static sl_status_t handle_get_nls_state(const handle_args_t &arg)
     sl_status_t status = zwapi_get_node_nls(node_id, &nls_state);
     if (SL_STATUS_OK == status)
     {
+      // TODO: Add commented condition below once related SAPI command is updated
+      status = zwave_store_nls_state(node_id, nls_state, REPORTED_ATTRIBUTE) /* || zwave_store_nls_support(node_id, nls_support, REPORTED_ATTRIBUTE) */;
+      if (SL_STATUS_OK != status) {
+        dprintf(out_stream, "Unable to store NLS state for Node ID: %d\n", node_id);
+        return SL_STATUS_FAIL;
+      }
       dprintf(out_stream, "Node ID %d, NLS state: %d\n", node_id, nls_state);
+      return SL_STATUS_OK;
     }
     else
     {
-      dprintf(out_stream, "Unable to read NLS state");
+      dprintf(out_stream,
+              "Unable to read NLS state for Node ID: %d\n",
+              node_id);
+      return SL_STATUS_FAIL;
     }
-    return status;
   } catch (const std::invalid_argument &e) {
     dprintf(out_stream, "%s: Invalid argument: %s\n", arg[0].c_str(), e.what());
     return SL_STATUS_FAIL;

applications/zpc/components/zwave_api/CMakeLists.txt

@@ -14,7 +14,7 @@ add_library(
   platform/${COMPATIBLE_PLATFORM}/zwapi_timestamp.c
 )
 
-target_link_libraries(zwave_api PUBLIC zwave_definitions PRIVATE unify zpc_attribute_store)
+target_link_libraries(zwave_api PUBLIC zwave_definitions PRIVATE unify)
 target_include_directories(
   zwave_api
   PRIVATE src platform/${COMPATIBLE_PLATFORM}

applications/zpc/components/zwave_api/src/zwapi_protocol_controller.c

@@ -19,7 +19,6 @@
 #include "zwapi_init.h"
 #include "zwapi_internal.h"
 #include "zwapi_utils.h"
-#include "zwave_utils.h"
 
 // Unify includes
 #include "sl_log.h"
@@ -828,14 +827,10 @@ sl_status_t zwapi_get_node_nls(
   if (send_command_status == SL_STATUS_OK && response_length > IDX_DATA)
   {
     *nls_state = response_buffer[IDX_DATA];
-    if (// zwave_store_nls_support(nodeId, *nls_support, REPORTED_ATTRIBUTE) ||
-        // TODO: to be added once SAPI command is updated
-        zwave_store_nls_state(nodeId, *nls_state, REPORTED_ATTRIBUTE))
-    {
-      return SL_STATUS_FAIL;
-    }
+    return SL_STATUS_OK;    
   }
-  return send_command_status;
+
+  return SL_STATUS_FAIL;
 }
 
 sl_status_t zwapi_transfer_protocol_cc(