Release ver_1.3.0

.cargo/config

@@ -1,7 +1,6 @@
 [target.armv7-unknown-linux-gnueabihf]
 linker = "arm-linux-gnueabihf-g++"
-rustflags = ["-C", "link-args=-Wl,--unresolved-symbols=ignore-in-object-files"]
 
-[target.x86_64-unknown-linux-gnu]
-rustflags = ["-C", "link-args=-Wl,--unresolved-symbols=ignore-in-object-files"]
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-g++"
 

.devcontainer/devcontainer.json

@@ -19,7 +19,7 @@
     "cmake.buildDirectory": "${workspaceRoot}/build_docker",
     "C_Cpp.default.cStandard": "c99",
     "C_Cpp.default.cppStandard": "c++11",
-    "clang-format.executable": "/usr/bin/clang-format-10"
+    "clang-format.executable": "/usr/bin/clang-format-12"
   },
   // Install extensions for vscode
   "extensions": [
@@ -32,8 +32,8 @@
   "containerUser": "user",
   "remoteUser": "user",
   "updateRemoteUserUID": true,
-  // Install clang-format-10
-  "postCreateCommand": "curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && echo \"deb http://apt.llvm.org/buster/ llvm-toolchain-buster-10 main\" | sudo tee /etc/apt/sources.list.d/llvm.list && sudo apt-get update && sudo apt-get install -y clang-format-10 && sudo update-binfmts --enable",
+  // Install clang-format-12
+  "postCreateCommand": "curl https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - && echo \"deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-12 main\" | sudo tee /etc/apt/sources.list.d/llvm.list && sudo apt-get update && sudo apt-get install -y clang-format-12 && sudo update-binfmts --enable",
   "runArgs": [
     // Uncomment when using a ptrace-based debugger like C++, Go, and Rust
     //"--cap-add=SYS_PTRACE",

.envrc

@@ -0,0 +1 @@
+use flake

.gitattributes

@@ -1,6 +1,6 @@
 "zap_2022.1.10_amd64.deb" filter=lfs diff=lfs merge=lfs -text
-"zap_apack_linux.zip" filter=lfs diff=lfs merge=lfs -text
 "slc_cli_linux.zip" filter=lfs diff=lfs merge=lfs -text
+"zap_apack_linux.zip" filter=lfs diff=lfs merge=lfs -text
 "zap-2022.1.10.dmg" filter=lfs diff=lfs merge=lfs -text
 "zap_apack_mac.zip" filter=lfs diff=lfs merge=lfs -text
 "slc_cli_mac.zip" filter=lfs diff=lfs merge=lfs -text

.vscode/cspell.json

@@ -15,7 +15,7 @@
         "etimer",
         "fixt",
         "Jenkinsfile",
-        "libuic",
+        "libunify",
         "mkdir",
         "mosquitto",
         "mqtt",

.vscode/tasks.json

@@ -12,7 +12,7 @@
             "label": "build_and_launch_debug_on_rpi",
             "type": "shell",
             "dependsOn": "build_rpi",
-            "command": "scp build_armhf/components/libuic.so build_armhf/applications/zpc/zpc pi@${input:rpi_ip}:. && ssh -t pi@${input:rpi_ip} \"gdbserver localhost:3001 ./zpc --zpc.datastore_file uic.db\"",
+            "command": "scp build_armhf/applications/zpc/zpc pi@${input:rpi_ip}:. && ssh -t pi@${input:rpi_ip} \"gdbserver localhost:3001 ./zpc --zpc.datastore_file uic.db\"",
             "problemMatcher": []
         }
     ],

.vscode/zpc.code-snippets

@@ -132,6 +132,77 @@
     ],
     "description": "Unity Test"
   },
+  "ZPC Unity Test with Attribute Store and contiki helpers": {
+    "prefix": "zpc",
+    "scope": "c,cpp",
+    "body": [
+      "/******************************************************************************",
+      " * # License",
+      " * <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
+      " ******************************************************************************",
+      " * The licensor of this software is Silicon Laboratories Inc. Your use of this",
+      " * software is governed by the terms of Silicon Labs Master Software License",
+      " * Agreement (MSLA) available at",
+      " * www.silabs.com/about-us/legal/master-software-license-agreement. This",
+      " * software is distributed to you in Source Code format and is governed by the",
+      " * sections of the MSLA applicable to Source Code.",
+      " *",
+      " *****************************************************************************/",
+      "#include \"unity.h\"",
+      "",
+      "// Includes from other components",
+      "#include \"datastore.h\"",
+      "#include \"attribute_store.h\"",
+      "#include \"attribute_store_helper.h\"",
+      "#include \"attribute_store_fixt.h\"",
+      "",
+      "// Interface includes",
+      "#include \"attribute_store_defined_attribute_types.h\"",
+      "",
+      "// ZPC includes",
+      "#include \"zpc_attribute_store_type_registration.h\"",
+      "#include \"zwave_utils.h\"",
+      "#include \"zwave_controller_types.h\"",
+      "",
+      "// Test helpers",
+      "#include \"zpc_attribute_store_test_helper.h\"",
+      "#include \"contiki_test_helper.h\"",
+      "",
+      "// Mock includes",
+      "",
+      "",
+      "",
+      "/// Setup the test suite (called once before all test_xxx functions are called)",
+      "void suiteSetUp()",
+      "{",
+      "  datastore_init(\":memory:\");",
+      "  attribute_store_init();",
+      "  zpc_attribute_store_register_known_attribute_types();",
+      "  zpc_attribute_store_test_helper_create_network();",
+      "  zwave_unid_set_home_id(home_id);",
+      "  contiki_test_helper_init();",
+      "}",
+      "",
+      "/// Teardown the test suite (called once after all test_xxx functions are called)",
+      "int suiteTearDown(int num_failures)",
+      "{",
+      "  attribute_store_teardown();",
+      "  datastore_teardown();",
+      "  return num_failures;",
+      "}",
+      "",
+      "/// Called before each and every test",
+      "void setUp()",
+      "{}",
+      "",
+      "/// Called after each and every test",
+      "void tearDown()",
+      "{}",
+      "",
+      "void test_${TM_FILENAME_BASE}(){}"
+    ],
+    "description": "ZPC Unity Test with Attribute Store and contiki helpers"
+  },
   "Rust file": {
     "prefix": "zpc",
     "scope": "rust",

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.21)
 
 # ##############################################################################
 # Modules
@@ -15,7 +15,6 @@ message(STATUS "Building Unify with BUILD_TYPE=${CMAKE_BUILD_TYPE}")
 
 include(cmake/include/version.cmake)
 include(cmake/include/build_permutations.cmake)
-include(cmake/include/link_wrap.cmake)
 
 project(
   uic
@@ -39,15 +38,28 @@ include(cmake/include/doxygen.cmake)
 include(cmake/include/package-helper.cmake)
 include(cmake/include/uic_helper.cmake)
 
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
-   OR NOT DEFINED CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+if(BUILD_TESTING)
+  include(components/testframework/target_add_unittest.cmake)
+endif()
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   set(CMAKE_INSTALL_PREFIX
       "/usr"
       CACHE PATH "default install path" FORCE)
 endif()
 
+message(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}")
+
+##########
+# Python #
+##########
+find_package(Python3 REQUIRED)
+
+########
+# Rust #
+########
 enable_language(Rust)
-set(RUST_MIN_VERSION 1.60)
+set(RUST_MIN_VERSION 1.64)
 if(CMAKE_Rust_COMPILER_VERSION VERSION_LESS RUST_MIN_VERSION)
   message(
     FATAL_ERROR
@@ -56,38 +68,18 @@ if(CMAKE_Rust_COMPILER_VERSION VERSION_LESS RUST_MIN_VERSION)
       see https://www.rust-lang.org/tools/install documentation for further details."
   )
 endif()
+
 include(CMakeCargo)
+
 # ##############################################################################
 # Global includes
 # ##############################################################################
 include_directories(include ${CMAKE_CURRENT_BINARY_DIR}/include)
 
-add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h
-  COMMAND bash ${CMAKE_CURRENT_SOURCE_DIR}/scripts/sl_status_strings.sh >
-          ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h
-  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/include/sl_status.h
-          ${CMAKE_CURRENT_SOURCE_DIR}/scripts/sl_status_strings.sh)
-add_custom_target(
-  sl_status_strings
-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/include/sl_status_strings.h)
-
 # ##############################################################################
 # Subdirectories
-# ##############################################################################
+# #############################################################################
 add_subdirectory(components)
 add_subdirectory(applications)
-
 include(cmake/include/package.cmake)
-
-# This is for generating cmake/release-version.cmake to add to source package
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/release-version.cmake.in
-               ${CMAKE_BINARY_DIR}/cmake/release-version.cmake)
-add_custom_target(
-  uic_source
-  COMMAND cp ${CMAKE_BINARY_DIR}/cmake/release-version.cmake
-          ${CMAKE_CURRENT_SOURCE_DIR}/cmake/release-version.cmake
-  COMMAND ${CMAKE_MAKE_PROGRAM} package_source
-  COMMAND rm ${CMAKE_CURRENT_SOURCE_DIR}/cmake/release-version.cmake)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/uic_version.h.in
-               ${CMAKE_BINARY_DIR}/include/uic_version.h)
+include(cmake/include/version_file.cmake)