Skip to content

Commit 37b8225

Browse files
author
Unify Automated
committed
Release ver_1.2.0
1 parent 7bfc495 commit 37b8225

File tree

12,317 files changed

+699280
-513814
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

12,317 files changed

+699280
-513814
lines changed

‎.cargo/config

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
[target.armv7-unknown-linux-gnueabihf]
22
linker = "arm-linux-gnueabihf-g++"
3+
rustflags = ["-C", "link-args=-Wl,--unresolved-symbols=ignore-in-object-files"]
4+
5+
[target.x86_64-unknown-linux-gnu]
6+
rustflags = ["-C", "link-args=-Wl,--unresolved-symbols=ignore-in-object-files"]
37

4-
[target.mips-unknown-linux-gnu]
5-
linker = "mips-linux-gnu-gcc"

‎.devcontainer/devcontainer.json

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
22
// https://github.com/microsoft/vscode-dev-containers/tree/v0.128.0/containers/docker-existing-dockerfile
33
{
4-
"name": "UIC container",
4+
"name": "Unify container",
55
// Sets the run context to one level up instead of the .devcontainer folder.
6-
"context": "..",
6+
"build": {
7+
"dockerfile":"../docker/Dockerfile",
8+
"context": "../docker",
9+
"args": {"ARCH": "amd64"}
10+
},
711
// Forward port 1883 (mosquitto) to host
812
"forwardPorts": [
9-
1883
13+
1883, // Mosquitto
14+
8030 // DevGui
1015
],
1116
// Set *default* container specific settings.json values on container create.
1217
"settings": {
13-
"terminal.integrated.shell.linux": null,
14-
"cmake.cmakePath": "/usr/bin/cmake",
18+
"cmake.cmakePath": "cmake",
1519
"cmake.buildDirectory": "${workspaceRoot}/build_docker",
1620
"C_Cpp.default.cStandard": "c99",
1721
"C_Cpp.default.cppStandard": "c++11",
@@ -25,7 +29,7 @@
2529
"cheshirekow.cmake-format",
2630
"xaver.clang-format"
2731
],
28-
"containerUser": "root",
32+
"containerUser": "user",
2933
"remoteUser": "user",
3034
"updateRemoteUserUID": true,
3135
// Install clang-format-10
@@ -38,9 +42,7 @@
3842
// Uncomment this to forward /dev/ttyUSB to the container (e.g. UZB)
3943
//"--device=/dev/ttyUSB0"
4044
],
41-
"build": {
42-
"dockerfile": "../docker/Dockerfile"
43-
},
45+
4446
"mounts": [
4547
// Uncomment when building ZigPC to mount the Gecko SDK to the container
4648
// "source=/opt/super,target=/opt/super,type=bind,consistency=cached",

‎.gitattributes

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
"zap_2022.1.10_amd64.deb" filter=lfs diff=lfs merge=lfs -text
12
"slc_cli_linux.zip" filter=lfs diff=lfs merge=lfs -text
23
"zap_apack_linux.zip" filter=lfs diff=lfs merge=lfs -text
3-
"zap_2022.1.10_amd64.deb" filter=lfs diff=lfs merge=lfs -text
4+
"slc_cli_mac.zip" filter=lfs diff=lfs merge=lfs -text
45
"zap_apack_mac.zip" filter=lfs diff=lfs merge=lfs -text
56
"zap-2022.1.10.dmg" filter=lfs diff=lfs merge=lfs -text
6-
"slc_cli_mac.zip" filter=lfs diff=lfs merge=lfs -text

‎.vscode/cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"myargs",
2424
"mystr",
2525
"mytag",
26+
"nlohmann",
2627
"nocase",
2728
"Posix",
2829
"QEMU",

‎.vscode/zpc.code-snippets

Lines changed: 90 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,87 @@
11
{
2-
// Place your zpc workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
3-
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
4-
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
5-
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
6-
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
7-
// Placeholders with the same ids are connected.
8-
// Example:
9-
// "Print to console": {
10-
// "scope": "javascript,typescript",
11-
// "prefix": "log",
12-
// "body": [
13-
// "console.log('$1');",
14-
// "$2"
15-
// ],
16-
// "description": "Log output to console"
2+
// Place your zpc workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
3+
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
4+
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
5+
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
6+
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
7+
// Placeholders with the same ids are connected.
8+
// Example:
9+
// "Print to console": {
10+
// "scope": "javascript,typescript",
11+
// "prefix": "log",
12+
// "body": [
13+
// "console.log('$1');",
14+
// "$2"
15+
// ],
16+
// "description": "Log output to console"
1717
// }
1818
"ZPC Header": {
1919
"scope": "c,cpp",
2020
"prefix": "zpc",
21-
"body":[
22-
"/******************************************************************************",
23-
" * # License",
24-
" * <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
25-
" ******************************************************************************",
26-
" * The licensor of this software is Silicon Laboratories Inc. Your use of this",
27-
" * software is governed by the terms of Silicon Labs Master Software License",
28-
" * Agreement (MSLA) available at",
29-
" * www.silabs.com/about-us/legal/master-software-license-agreement. This",
30-
" * software is distributed to you in Source Code format and is governed by the",
31-
" * sections of the MSLA applicable to Source Code.",
32-
" *",
33-
" *****************************************************************************/",
34-
"",
35-
"/**",
36-
" * @defgroup ${TM_FILENAME_BASE}",
37-
" * @brief TODO: Write brief for ${TM_FILENAME_BASE}",
38-
" *",
39-
" * TODO: Write component description for ${TM_FILENAME_BASE}",
40-
" *",
41-
" * @{",
42-
" */",
43-
" ",
44-
"#ifndef ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
45-
"#define ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
46-
"",
47-
"#ifdef __cplusplus",
48-
"extern \"C\" {",
49-
"#endif",
50-
"",
51-
"#ifdef __cplusplus",
52-
"}",
53-
"#endif",
54-
"",
55-
"#endif //${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
56-
"/** @} end ${TM_FILENAME_BASE} */",
57-
""
21+
"body": [
22+
"/******************************************************************************",
23+
" * # License",
24+
" * <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
25+
" ******************************************************************************",
26+
" * The licensor of this software is Silicon Laboratories Inc. Your use of this",
27+
" * software is governed by the terms of Silicon Labs Master Software License",
28+
" * Agreement (MSLA) available at",
29+
" * www.silabs.com/about-us/legal/master-software-license-agreement. This",
30+
" * software is distributed to you in Source Code format and is governed by the",
31+
" * sections of the MSLA applicable to Source Code.",
32+
" *",
33+
" *****************************************************************************/",
34+
"",
35+
"/**",
36+
" * @defgroup ${TM_FILENAME_BASE}",
37+
" * @brief TODO: Write brief for ${TM_FILENAME_BASE}",
38+
" *",
39+
" * TODO: Write component description for ${TM_FILENAME_BASE}",
40+
" *",
41+
" * @{",
42+
" */",
43+
" ",
44+
"#ifndef ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
45+
"#define ${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
46+
"",
47+
"#ifdef __cplusplus",
48+
"extern \"C\" {",
49+
"#endif",
50+
"",
51+
"#ifdef __cplusplus",
52+
"}",
53+
"#endif",
54+
"",
55+
"#endif //${TM_FILENAME/(.*)\\.(.*)/${1:/upcase}_${2:/upcase}/}",
56+
"/** @} end ${TM_FILENAME_BASE} */",
57+
""
5858
],
5959
"description": "ZPC C Header"
6060
},
61-
6261
"ZPC Source": {
6362
"prefix": "zpc",
6463
"scope": "c,cpp",
65-
"body":[
66-
"/******************************************************************************",
67-
" * # License",
68-
" * <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
69-
" ******************************************************************************",
70-
" * The licensor of this software is Silicon Laboratories Inc. Your use of this",
71-
" * software is governed by the terms of Silicon Labs Master Software License",
72-
" * Agreement (MSLA) available at",
73-
" * www.silabs.com/about-us/legal/master-software-license-agreement. This",
74-
" * software is distributed to you in Source Code format and is governed by the",
75-
" * sections of the MSLA applicable to Source Code.",
76-
" *",
77-
" *****************************************************************************/",
78-
"#include \"${TM_FILENAME_BASE}.h\"", ],
64+
"body": [
65+
"/******************************************************************************",
66+
" * # License",
67+
" * <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
68+
" ******************************************************************************",
69+
" * The licensor of this software is Silicon Laboratories Inc. Your use of this",
70+
" * software is governed by the terms of Silicon Labs Master Software License",
71+
" * Agreement (MSLA) available at",
72+
" * www.silabs.com/about-us/legal/master-software-license-agreement. This",
73+
" * software is distributed to you in Source Code format and is governed by the",
74+
" * sections of the MSLA applicable to Source Code.",
75+
" *",
76+
" *****************************************************************************/",
77+
"#include \"${TM_FILENAME_BASE}.h\"",
78+
],
7979
"description": "ZPC C Source"
8080
},
81-
8281
"Contiki Process": {
8382
"scope": "c,cpp",
8483
"prefix": "zpc",
85-
"body":[
84+
"body": [
8685
"PROCESS(${1:${TM_FILENAME_BASE}_process}, \"$1\");",
8786
"",
8887
"PROCESS_THREAD($1, ev, data)",
@@ -100,11 +99,10 @@
10099
],
101100
"description": "Add Contiki process"
102101
},
103-
104102
"Unity Test": {
105103
"prefix": "zpc",
106104
"scope": "c,cpp",
107-
"body":[
105+
"body": [
108106
"/******************************************************************************",
109107
" * # License",
110108
" * <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
@@ -118,7 +116,6 @@
118116
" *",
119117
" *****************************************************************************/",
120118
"#include \"unity.h\"",
121-
122119
"/// Setup the test suite (called once before all test_xxx functions are called)",
123120
"void suiteSetUp() {}",
124121
"",
@@ -138,7 +135,7 @@
138135
"Rust file": {
139136
"prefix": "zpc",
140137
"scope": "rust",
141-
"body":[
138+
"body": [
142139
"///////////////////////////////////////////////////////////////////////////////",
143140
"// # License",
144141
"// <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
@@ -153,5 +150,24 @@
153150
"///////////////////////////////////////////////////////////////////////////////",
154151
],
155152
"description": "UIC rust source file"
156-
},
153+
},
154+
"Python file": {
155+
"prefix": "zpc",
156+
"scope": "python",
157+
"body": [
158+
"###############################################################################",
159+
"## License",
160+
"## <b>Copyright ${CURRENT_YEAR} Silicon Laboratories Inc. www.silabs.com</b>",
161+
"###############################################################################",
162+
"## The licensor of this software is Silicon Laboratories Inc. Your use of this",
163+
"## software is governed by the terms of Silicon Labs Master Software License",
164+
"## Agreement (MSLA) available at",
165+
"## www.silabs.com/about-us/legal/master-software-license-agreement. This",
166+
"## software is distributed to you in Source Code format and is governed by the",
167+
"## sections of the MSLA applicable to Source Code.",
168+
"##",
169+
"###############################################################################",
170+
],
171+
"description": "UIC python source file"
172+
}
157173
}

‎CMakeLists.txt

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ set(CMAKE_INCLUDE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/include/"
1111
# ##############################################################################
1212
# Include Configurations
1313
# ##############################################################################
14+
message(STATUS "Building Unify with BUILD_TYPE=${CMAKE_BUILD_TYPE}")
15+
1416
include(cmake/include/version.cmake)
1517
include(cmake/include/build_permutations.cmake)
1618
include(cmake/include/link_wrap.cmake)
@@ -20,16 +22,29 @@ project(
2022
LANGUAGES C CXX
2123
VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV})
2224

25+
# Set shared version string to use in filenames (deb packages etc.)
26+
set(FILE_NAME_VERSIONING "${CMAKE_PROJECT_VERSION}")
27+
if (VERSION_PATCH)
28+
string(APPEND FILE_NAME_VERSIONING "-${VERSION_PATCH}")
29+
endif()
30+
set(FILE_NAME_VERSIONING_ARCH "${FILE_NAME_VERSIONING}_${CMAKE_SYSTEM_PROCESSOR}")
31+
2332
include(cmake/include/target_interface_libraries.cmake)
2433
include(cmake/include/compiler_options.cmake)
2534
include(cmake/include/compatible_platform.cmake)
2635
include(cmake/include/unittest.cmake)
2736
include(cmake/include/doxygen.cmake)
28-
include(cmake/include/package.cmake)
37+
include(cmake/include/package-helper.cmake)
2938
include(cmake/include/uic_helper.cmake)
3039

40+
41+
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR NOT DEFINED CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
42+
set(CMAKE_INSTALL_PREFIX "/usr"
43+
CACHE PATH "default install path" FORCE)
44+
endif()
45+
3146
enable_language(Rust)
32-
set(RUST_MIN_VERSION 1.58.1)
47+
set(RUST_MIN_VERSION 1.60)
3348
if(CMAKE_Rust_COMPILER_VERSION VERSION_LESS RUST_MIN_VERSION)
3449
message(
3550
FATAL_ERROR
@@ -60,6 +75,8 @@ add_custom_target(
6075
add_subdirectory(components)
6176
add_subdirectory(applications)
6277

78+
include(cmake/include/package.cmake)
79+
6380
# This is for generating cmake/release-version.cmake to add to source package
6481
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/release-version.cmake.in
6582
${CMAKE_BINARY_DIR}/cmake/release-version.cmake)

0 commit comments

Comments
 (0)