Release ver_1.2.0

.cargo/config

@@ -1,5 +1,7 @@
 [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.mips-unknown-linux-gnu]
-linker = "mips-linux-gnu-gcc"

.devcontainer/devcontainer.json

@@ -1,17 +1,21 @@
 // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.128.0/containers/docker-existing-dockerfile
 {
-  "name": "UIC container",
+  "name": "Unify container",
   // Sets the run context to one level up instead of the .devcontainer folder.
-  "context": "..",
+  "build": {
+    "dockerfile":"../docker/Dockerfile",
+    "context": "../docker",
+    "args": {"ARCH": "amd64"}
+  },
   // Forward port 1883 (mosquitto) to host
   "forwardPorts": [
-    1883
+    1883, // Mosquitto
+    8030  // DevGui
   ],
   // Set *default* container specific settings.json values on container create.
   "settings": {
-    "terminal.integrated.shell.linux": null,
-    "cmake.cmakePath": "/usr/bin/cmake",
+    "cmake.cmakePath": "cmake",
     "cmake.buildDirectory": "${workspaceRoot}/build_docker",
     "C_Cpp.default.cStandard": "c99",
     "C_Cpp.default.cppStandard": "c++11",
@@ -25,7 +29,7 @@
     "cheshirekow.cmake-format",
     "xaver.clang-format"
   ],
-  "containerUser": "root",
+  "containerUser": "user",
   "remoteUser": "user",
   "updateRemoteUserUID": true,
   // Install clang-format-10
@@ -38,9 +42,7 @@
     // Uncomment this to forward /dev/ttyUSB to the container (e.g. UZB)
     //"--device=/dev/ttyUSB0"
   ],
-  "build": {
-    "dockerfile": "../docker/Dockerfile"
-  },
+
   "mounts": [
     // Uncomment when building ZigPC to mount the Gecko SDK to the container
     // "source=/opt/super,target=/opt/super,type=bind,consistency=cached",

.gitattributes

@@ -1,6 +1,6 @@
+"zap_2022.1.10_amd64.deb" 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_amd64.deb" filter=lfs diff=lfs merge=lfs -text
+"slc_cli_mac.zip" filter=lfs diff=lfs merge=lfs -text
 "zap_apack_mac.zip" filter=lfs diff=lfs merge=lfs -text
 "zap-2022.1.10.dmg" filter=lfs diff=lfs merge=lfs -text
-"slc_cli_mac.zip" filter=lfs diff=lfs merge=lfs -text

.vscode/cspell.json

@@ -23,6 +23,7 @@
         "myargs",
         "mystr",
         "mytag",
+        "nlohmann",
         "nocase",
         "Posix",
         "QEMU",

.vscode/zpc.code-snippets

@@ -1,88 +1,87 @@
 {
-	// Place your zpc workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
-	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
-	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
-	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
-	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
-	// Placeholders with the same ids are connected.
-	// Example:
-	// "Print to console": {
-	// 	"scope": "javascript,typescript",
-	// 	"prefix": "log",
-	// 	"body": [
-	// 		"console.log('$1');",
-	// 		"$2"
-	// 	],
-	// 	"description": "Log output to console"
+  // Place your zpc workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
+  // description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
+  // is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
+  // used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
+  // $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
+  // Placeholders with the same ids are connected.
+  // Example:
+  // "Print to console": {
+  // 	"scope": "javascript,typescript",
+  // 	"prefix": "log",
+  // 	"body": [
+  // 		"console.log('$1');",
+  // 		"$2"
+  // 	],
+  // 	"description": "Log output to console"
   // }
   "ZPC Header": {
     "scope": "c,cpp",
     "prefix": "zpc",
-    "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.",
-" *",
-" *****************************************************************************/",
-"",
-"/**",
-" * @defgroup ${TM_FILENAME_BASE}",
-" * @brief TODO: Write brief for ${TM_FILENAME_BASE}",
-" *",
-" * TODO: Write component description for ${TM_FILENAME_BASE}",
-" *",
-" * @{",
-" */",
-" ",
-"#ifndef ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
-"#define ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
-"",
-"#ifdef __cplusplus",
-"extern \"C\" {",
-"#endif",
-"",
-"#ifdef __cplusplus",
-"}",
-"#endif",
-"",
-"#endif  //${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
-"/** @} end ${TM_FILENAME_BASE} */",
-""
+    "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.",
+      " *",
+      " *****************************************************************************/",
+      "",
+      "/**",
+      " * @defgroup ${TM_FILENAME_BASE}",
+      " * @brief TODO: Write brief for ${TM_FILENAME_BASE}",
+      " *",
+      " * TODO: Write component description for ${TM_FILENAME_BASE}",
+      " *",
+      " * @{",
+      " */",
+      " ",
+      "#ifndef ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
+      "#define ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
+      "",
+      "#ifdef __cplusplus",
+      "extern \"C\" {",
+      "#endif",
+      "",
+      "#ifdef __cplusplus",
+      "}",
+      "#endif",
+      "",
+      "#endif  //${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
+      "/** @} end ${TM_FILENAME_BASE} */",
+      ""
     ],
     "description": "ZPC C Header"
   },
-
   "ZPC Source": {
     "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 \"${TM_FILENAME_BASE}.h\"",   ],
+    "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 \"${TM_FILENAME_BASE}.h\"",
+    ],
     "description": "ZPC C Source"
   },
-
   "Contiki Process": {
     "scope": "c,cpp",
     "prefix": "zpc",
-    "body":[
+    "body": [
       "PROCESS(${1:${TM_FILENAME_BASE}_process}, \"$1\");",
       "",
       "PROCESS_THREAD($1, ev, data)",
@@ -100,11 +99,10 @@
     ],
     "description": "Add Contiki process"
   },
-
   "Unity Test": {
     "prefix": "zpc",
     "scope": "c,cpp",
-    "body":[
+    "body": [
       "/******************************************************************************",
       " * # License",
       " * <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
@@ -118,7 +116,6 @@
       " *",
       " *****************************************************************************/",
       "#include \"unity.h\"",
-
       "/// Setup the test suite (called once before all test_xxx functions are called)",
       "void suiteSetUp() {}",
       "",
@@ -138,7 +135,7 @@
   "Rust file": {
     "prefix": "zpc",
     "scope": "rust",
-    "body":[
+    "body": [
       "///////////////////////////////////////////////////////////////////////////////",
       "// # License",
       "// <b>Copyright ${CURRENT_YEAR}  Silicon Laboratories Inc. www.silabs.com</b>",
@@ -153,5 +150,24 @@
       "///////////////////////////////////////////////////////////////////////////////",
     ],
     "description": "UIC rust source file"
-  },  
+  },
+  "Python file": {
+    "prefix": "zpc",
+    "scope": "python",
+    "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.",
+      "##",
+      "###############################################################################",
+    ],
+    "description": "UIC python source file"
+  }
 }

CMakeLists.txt

@@ -11,6 +11,8 @@ set(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/include/"
 # ##############################################################################
 # Include Configurations
 # ##############################################################################
+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)
@@ -20,16 +22,29 @@ project(
   LANGUAGES C CXX
   VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV})
 
+# Set shared version string to use in filenames (deb packages etc.)
+set(FILE_NAME_VERSIONING "${CMAKE_PROJECT_VERSION}")
+if (VERSION_PATCH)
+    string(APPEND FILE_NAME_VERSIONING "-${VERSION_PATCH}")
+endif()
+set(FILE_NAME_VERSIONING_ARCH "${FILE_NAME_VERSIONING}_${CMAKE_SYSTEM_PROCESSOR}")
+
 include(cmake/include/target_interface_libraries.cmake)
 include(cmake/include/compiler_options.cmake)
 include(cmake/include/compatible_platform.cmake)
 include(cmake/include/unittest.cmake)
 include(cmake/include/doxygen.cmake)
-include(cmake/include/package.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)
+    set(CMAKE_INSTALL_PREFIX "/usr"
+           CACHE PATH "default install path" FORCE)
+endif()
+
 enable_language(Rust)
-set(RUST_MIN_VERSION 1.58.1)
+set(RUST_MIN_VERSION 1.60)
 if(CMAKE_Rust_COMPILER_VERSION VERSION_LESS RUST_MIN_VERSION)
   message(
     FATAL_ERROR
@@ -60,6 +75,8 @@ add_custom_target(
 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)