Skip to content

Commit 637599d

Browse files
author
Unify Automated
committed
Release ver_1.4.0
1 parent 42fb259 commit 637599d

File tree

10,861 files changed

+1199877
-858160
lines changed

Some content is hidden

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

10,861 files changed

+1199877
-858160
lines changed

.clang-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,portability-*,readability-*'
2+
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,portability-*,readability-*,include-cleaner-*'
33
WarningsAsErrors: ''
44
HeaderFilterRegex: ''
55
AnalyzeTemporaryDtors: false

.envrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

applications/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Fetch dependencies if forced
22
if(FETCH_GSDK MATCHES ON)
3-
find_package(GeckoSDK 4.2.2 REQUIRED)
3+
find_package(GeckoSDK 4.3.0 REQUIRED)
44
endif()
55

66
# Build options will determine if the applications will be included and build
@@ -14,11 +14,11 @@ else()
1414
endif()
1515

1616
## Example applications/components
17-
if((BUILD_UIC_DEMO MATCHES ON) OR (BUILD_EPC MATCHES ON))
17+
if((BUILD_UIC_DEMO MATCHES ON) OR (BUILD_EPC MATCHES ON) OR (BUILD_EMD MATCHES ON))
1818
add_subdirectory(examples)
19-
message(STATUS "UIC Demo and/or EPC will build")
19+
message(STATUS "UIC Demo, Example MQTT Device (EMD) and/or EPC will build")
2020
else()
21-
message(STATUS "UIC Demo and/or EPC will NOT build")
21+
message(STATUS "UIC Demo, Example MQTT Device (EMD) and/or EPC will NOT build")
2222
endif()
2323

2424
## IoT services

applications/aox/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
find_package(GeckoSDK 4.2.2 REQUIRED)
1+
find_package(GeckoSDK 4.3.0 REQUIRED)
22

33
add_subdirectory(components)
44
add_subdirectory(applications)

applications/aox/applications/aoxpc/components/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@ add_library(cte
2020
${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/cte_conn.c
2121
${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/cte_silabs.c
2222
)
23+
24+
# TODO: this workaround should be removed once the GSDK issue is fixed.
25+
set_source_files_properties(
26+
${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/cte_conn_less.c PROPERTIES COMPILE_FLAGS -Wno-error=deprecated-declarations
27+
)
28+
2329
target_include_directories(cte
2430
PUBLIC ${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte
2531
PRIVATE ${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/config
Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
{
2-
"name": "AoX Locator Configuration",
3-
"version": "AoXLocator-v1",
4-
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
5-
"helpers": ["addon-helper.js"],
6-
"templates": [
7-
{
8-
"path": "aox_locator_configuration_attributes.h.zapt",
9-
"name": "Type definitions for the AoXLocator attributes",
10-
"output": "include/aox_locator_configuration_attributes.h"
11-
},
12-
{
13-
"path": "aox_locator_configuration_attributes.c.zapt",
14-
"name": "Implementation of the AoXLocator attributes handling",
15-
"output": "src/aox_locator_configuration_attributes.c"
16-
}
17-
]
18-
}
2+
"name": "AoX Locator Configuration",
3+
"version": "AoXLocator-v1",
4+
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
5+
"helpers": [
6+
"addon-helper.js",
7+
"../../../../../../../components/uic_dotdot/zap/addon-base-helper.js"
8+
],
9+
"templates": [{
10+
"path": "aox_locator_configuration_attributes.h.zapt",
11+
"name": "Type definitions for the AoXLocator attributes",
12+
"output": "include/aox_locator_configuration_attributes.h"
13+
},
14+
{
15+
"path": "aox_locator_configuration_attributes.c.zapt",
16+
"name": "Implementation of the AoXLocator attributes handling",
17+
"output": "src/aox_locator_configuration_attributes.c"
18+
}
19+
]
20+
}

applications/aox/applications/aoxpc/components/aoxpc_attribute_store/include/aoxpc_attribute_store_defined_attribute_types.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@
3131

3232
#include "aoxpc_attribute_store_dotdot_attributes.h"
3333

34-
///< Set the proper name for the Root,
35-
DEFINE_ATTRIBUTE(ATTRIBUTE_STORE_ROOT, 0x0001)
36-
3734
// Generic Node attributes, should be attached under NodeID nodes and not endpoints.
3835
// Suggested range 0x01..0xFF
3936

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
{
2-
"name": "AoX Locator Attributestore",
3-
"version": "AoXLocator-v1",
4-
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
5-
"helpers": ["addon-helper.js"],
6-
"templates": [
7-
{
8-
"path": "aoxpc_attribute_store_dotdot_attributes.h.zapt",
9-
"name": "Definitions for the Attribute Store helper functions for DotDot attributes",
10-
"output": "include/aoxpc_attribute_store_dotdot_attributes.h"
11-
},
12-
{
13-
"path": "aoxpc_attribute_store_dotdot_attributes.c.zapt",
14-
"name": "Implementation of the Attribute Store helper functions for DotDot attributes",
15-
"output": "src/aoxpc_attribute_store_dotdot_attributes.c"
16-
}
17-
]
18-
}
2+
"name": "AoX Locator Attributestore",
3+
"version": "AoXLocator-v1",
4+
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
5+
"helpers": [
6+
"addon-helper.js",
7+
"../../../../../../../components/uic_dotdot/zap/addon-base-helper.js"
8+
],
9+
"templates": [{
10+
"path": "aoxpc_attribute_store_dotdot_attributes.h.zapt",
11+
"name": "Definitions for the Attribute Store helper functions for DotDot attributes",
12+
"output": "include/aoxpc_attribute_store_dotdot_attributes.h"
13+
},
14+
{
15+
"path": "aoxpc_attribute_store_dotdot_attributes.c.zapt",
16+
"name": "Implementation of the Attribute Store helper functions for DotDot attributes",
17+
"output": "src/aoxpc_attribute_store_dotdot_attributes.c"
18+
}
19+
]
20+
}

applications/aox/applications/aoxpc/debconf/uic-aoxpc.service

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ Description=Unified IoT AoX Protcol Controller
33
After=network.target mosquitto.service
44

55
[Service]
6+
WorkingDirectory=/var/lib/uic
67
ExecStart=/usr/bin/aoxpc
78
Restart=on-failure
89
KillMode=process
910
User=uic
1011
Group=uic
1112

1213
[Install]
13-
WantedBy=multi-user.target
14+
WantedBy=multi-user.target

applications/aox/components/CMakeLists.txt

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
add_subdirectory(app_log_wrapper)
2+
add_subdirectory(rtl_lib)
23
add_subdirectory(ucl_mqtt_helper)
34

45
# Components from GSDK
@@ -84,27 +85,3 @@ target_compile_options(aoa_cjson
8485
)
8586

8687
set_target_properties(aoa_cjson PROPERTIES OUTPUT_NAME "cjson")
87-
88-
# ##############################################################################
89-
# Real-Time Locationing library
90-
# ##############################################################################
91-
add_library(rtl_lib STATIC IMPORTED GLOBAL)
92-
93-
target_link_libraries(rtl_lib INTERFACE stdc++)
94-
target_link_options(rtl_lib INTERFACE $<$<C_COMPILER_ID:GNU>:-no-pie>)
95-
96-
# Find library for current platform
97-
string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME)
98-
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR)
99-
# TODO: remove this workaround once CMAKE_SYSTEM_PROCESSOR is fixed for RPI.
100-
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armhf")
101-
set(SYSTEM_PROCESSOR "armv7l")
102-
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
103-
set(SYSTEM_PROCESSOR "aarch64")
104-
endif()
105-
106-
set_target_properties(rtl_lib PROPERTIES
107-
IMPORTED_LOCATION ${GeckoSDK_ROOT_DIR}/util/silicon_labs/aox/lib/gcc/release/libaox_static_${SYSTEM_NAME}_${SYSTEM_PROCESSOR}.a
108-
INTERFACE_INCLUDE_DIRECTORIES ${GeckoSDK_ROOT_DIR}/util/silicon_labs/aox/inc
109-
INTERFACE_COMPILE_DEFINITIONS "RTL_LIB"
110-
)

0 commit comments

Comments
 (0)