Skip to content

Commit

Permalink
Release ver_1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Unify Automated committed Aug 9, 2023
1 parent 42fb259 commit 637599d
Show file tree
Hide file tree
Showing 10,861 changed files with 1,199,877 additions and 858,160 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .clang-tidy
@@ -1,5 +1,5 @@
---
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,portability-*,readability-*'
Checks: 'clang-diagnostic-*,clang-analyzer-*,-*,portability-*,readability-*,include-cleaner-*'
WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
Expand Down
1 change: 0 additions & 1 deletion .envrc

This file was deleted.

8 changes: 4 additions & 4 deletions applications/CMakeLists.txt
@@ -1,6 +1,6 @@
# Fetch dependencies if forced
if(FETCH_GSDK MATCHES ON)
find_package(GeckoSDK 4.2.2 REQUIRED)
find_package(GeckoSDK 4.3.0 REQUIRED)
endif()

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

## Example applications/components
if((BUILD_UIC_DEMO MATCHES ON) OR (BUILD_EPC MATCHES ON))
if((BUILD_UIC_DEMO MATCHES ON) OR (BUILD_EPC MATCHES ON) OR (BUILD_EMD MATCHES ON))
add_subdirectory(examples)
message(STATUS "UIC Demo and/or EPC will build")
message(STATUS "UIC Demo, Example MQTT Device (EMD) and/or EPC will build")
else()
message(STATUS "UIC Demo and/or EPC will NOT build")
message(STATUS "UIC Demo, Example MQTT Device (EMD) and/or EPC will NOT build")
endif()

## IoT services
Expand Down
2 changes: 1 addition & 1 deletion applications/aox/CMakeLists.txt
@@ -1,4 +1,4 @@
find_package(GeckoSDK 4.2.2 REQUIRED)
find_package(GeckoSDK 4.3.0 REQUIRED)

add_subdirectory(components)
add_subdirectory(applications)
6 changes: 6 additions & 0 deletions applications/aox/applications/aoxpc/components/CMakeLists.txt
Expand Up @@ -20,6 +20,12 @@ add_library(cte
${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/cte_conn.c
${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/cte_silabs.c
)

# TODO: this workaround should be removed once the GSDK issue is fixed.
set_source_files_properties(
${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/cte_conn_less.c PROPERTIES COMPILE_FLAGS -Wno-error=deprecated-declarations
)

target_include_directories(cte
PUBLIC ${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte
PRIVATE ${GeckoSDK_ROOT_DIR}/app/bluetooth/common_host/aoa_cte/config
Expand Down
@@ -1,18 +1,20 @@
{
"name": "AoX Locator Configuration",
"version": "AoXLocator-v1",
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
"helpers": ["addon-helper.js"],
"templates": [
{
"path": "aox_locator_configuration_attributes.h.zapt",
"name": "Type definitions for the AoXLocator attributes",
"output": "include/aox_locator_configuration_attributes.h"
},
{
"path": "aox_locator_configuration_attributes.c.zapt",
"name": "Implementation of the AoXLocator attributes handling",
"output": "src/aox_locator_configuration_attributes.c"
}
]
}
"name": "AoX Locator Configuration",
"version": "AoXLocator-v1",
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
"helpers": [
"addon-helper.js",
"../../../../../../../components/uic_dotdot/zap/addon-base-helper.js"
],
"templates": [{
"path": "aox_locator_configuration_attributes.h.zapt",
"name": "Type definitions for the AoXLocator attributes",
"output": "include/aox_locator_configuration_attributes.h"
},
{
"path": "aox_locator_configuration_attributes.c.zapt",
"name": "Implementation of the AoXLocator attributes handling",
"output": "src/aox_locator_configuration_attributes.c"
}
]
}
Expand Up @@ -31,9 +31,6 @@

#include "aoxpc_attribute_store_dotdot_attributes.h"

///< Set the proper name for the Root,
DEFINE_ATTRIBUTE(ATTRIBUTE_STORE_ROOT, 0x0001)

// Generic Node attributes, should be attached under NodeID nodes and not endpoints.
// Suggested range 0x01..0xFF

Expand Down
@@ -1,18 +1,20 @@
{
"name": "AoX Locator Attributestore",
"version": "AoXLocator-v1",
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
"helpers": ["addon-helper.js"],
"templates": [
{
"path": "aoxpc_attribute_store_dotdot_attributes.h.zapt",
"name": "Definitions for the Attribute Store helper functions for DotDot attributes",
"output": "include/aoxpc_attribute_store_dotdot_attributes.h"
},
{
"path": "aoxpc_attribute_store_dotdot_attributes.c.zapt",
"name": "Implementation of the Attribute Store helper functions for DotDot attributes",
"output": "src/aoxpc_attribute_store_dotdot_attributes.c"
}
]
}
"name": "AoX Locator Attributestore",
"version": "AoXLocator-v1",
"override": "../../../../../../../components/uic_dotdot/zap/addon-override.js",
"helpers": [
"addon-helper.js",
"../../../../../../../components/uic_dotdot/zap/addon-base-helper.js"
],
"templates": [{
"path": "aoxpc_attribute_store_dotdot_attributes.h.zapt",
"name": "Definitions for the Attribute Store helper functions for DotDot attributes",
"output": "include/aoxpc_attribute_store_dotdot_attributes.h"
},
{
"path": "aoxpc_attribute_store_dotdot_attributes.c.zapt",
"name": "Implementation of the Attribute Store helper functions for DotDot attributes",
"output": "src/aoxpc_attribute_store_dotdot_attributes.c"
}
]
}
Expand Up @@ -3,11 +3,12 @@ Description=Unified IoT AoX Protcol Controller
After=network.target mosquitto.service

[Service]
WorkingDirectory=/var/lib/uic
ExecStart=/usr/bin/aoxpc
Restart=on-failure
KillMode=process
User=uic
Group=uic

[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target
25 changes: 1 addition & 24 deletions applications/aox/components/CMakeLists.txt
@@ -1,4 +1,5 @@
add_subdirectory(app_log_wrapper)
add_subdirectory(rtl_lib)
add_subdirectory(ucl_mqtt_helper)

# Components from GSDK
Expand Down Expand Up @@ -84,27 +85,3 @@ target_compile_options(aoa_cjson
)

set_target_properties(aoa_cjson PROPERTIES OUTPUT_NAME "cjson")

# ##############################################################################
# Real-Time Locationing library
# ##############################################################################
add_library(rtl_lib STATIC IMPORTED GLOBAL)

target_link_libraries(rtl_lib INTERFACE stdc++)
target_link_options(rtl_lib INTERFACE $<$<C_COMPILER_ID:GNU>:-no-pie>)

# Find library for current platform
string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME)
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR)
# TODO: remove this workaround once CMAKE_SYSTEM_PROCESSOR is fixed for RPI.
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armhf")
set(SYSTEM_PROCESSOR "armv7l")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(SYSTEM_PROCESSOR "aarch64")
endif()

set_target_properties(rtl_lib PROPERTIES
IMPORTED_LOCATION ${GeckoSDK_ROOT_DIR}/util/silicon_labs/aox/lib/gcc/release/libaox_static_${SYSTEM_NAME}_${SYSTEM_PROCESSOR}.a
INTERFACE_INCLUDE_DIRECTORIES ${GeckoSDK_ROOT_DIR}/util/silicon_labs/aox/inc
INTERFACE_COMPILE_DEFINITIONS "RTL_LIB"
)
23 changes: 23 additions & 0 deletions applications/aox/components/rtl_lib/CMakeLists.txt
@@ -0,0 +1,23 @@
# ##############################################################################
# Real-Time Locationing library
# ##############################################################################
add_library(rtl_lib STATIC IMPORTED GLOBAL)

target_link_libraries(rtl_lib INTERFACE stdc++)
target_link_options(rtl_lib INTERFACE $<$<C_COMPILER_ID:GNU>:-no-pie>)

# Find library for current platform
string(TOLOWER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME)
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSTEM_PROCESSOR)
# TODO: remove this workaround once CMAKE_SYSTEM_PROCESSOR is fixed for RPI.
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "armhf")
set(SYSTEM_PROCESSOR "armv7l")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(SYSTEM_PROCESSOR "aarch64")
endif()

set_target_properties(rtl_lib PROPERTIES
IMPORTED_LOCATION ${CMAKE_CURRENT_LIST_DIR}/lib/gcc/release/libaox_static_${SYSTEM_NAME}_${SYSTEM_PROCESSOR}.a
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_LIST_DIR}/inc
INTERFACE_COMPILE_DEFINITIONS "RTL_LIB"
)
5 changes: 5 additions & 0 deletions applications/aox/components/rtl_lib/inc/license.txt
@@ -0,0 +1,5 @@
This software makes use of the Eigen 3.3.4 C++ template library for linear
algebra, which is licensed under Mozilla Public License 2.0 available at
https://www.mozilla.org/en-US/MPL/2.0/. The source code for the Eigen
library can be accessed at https://bitbucket.org/eigen/eigen/. No changes
have been made to the source code of the library.

0 comments on commit 637599d

Please sign in to comment.