Skip to content

Commit

Permalink
Release ver_1.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Unify Automated committed Aug 7, 2024
1 parent 8c3c67c commit 954fdce
Show file tree
Hide file tree
Showing 12,192 changed files with 1,298,947 additions and 1,495,265 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 .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"bridge_binaries.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
"zap_apack_mac.zip" filter=lfs diff=lfs merge=lfs -text
"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
13 changes: 7 additions & 6 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
@@@UnifyCore @naagarwa @mamehta @sushanka
@@@UnifyZWave @phcoval @jeboullo
@@@UnifyZigbee @jolitwin @mpbreton
@@@UnifyCore @naagarwa @mamehta @sushanka @sabollim
@@@UnifyZWave @phcoval
# Temporarily adding core team as reviewer for Zigbee
@@@UnifyZigbee @naagarwa @sushanka @sabollim
@@@UnifyBT @tabenyhe @tahornos
@@@Documentation @naagarwa @mamehta @phcoval @jolitwin @mpbreton @nibertol @tabenyhe @jeboullo
@@@UnifyFwkServices @naagarwa @mamehta @sushanka
@@@UnifyIoTServices @naagarwa @sushanka @sepastuk
@@@Documentation @naagarwa @mamehta @phcoval @nibertol @tabenyhe @jutiron @bolabbe
@@@UnifyFwkServices @naagarwa @mamehta @sushanka @sabollim
@@@UnifyIoTServices @naagarwa @sushanka @sabollim
@@@CICD @naagarwa @dethammi @sushanka
@@@UnifyMultiProtcol @nibertol @supratap @frkillee @ismaghni @alautott

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM debian:bullseye
FROM debian:bookworm

ENV DEBIAN_FRONTEND noninteractive
ENV LC_ALL en_US.UTF-8
Expand Down
2 changes: 1 addition & 1 deletion applications/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Fetch dependencies if forced
if(FETCH_GSDK MATCHES ON)
find_package(GeckoSDK 4.3.0 REQUIRED)
find_package(GeckoSDK 2024.6.0 REQUIRED)
endif()

# Build options will determine if the applications will be included and build
Expand Down
2 changes: 1 addition & 1 deletion applications/aox/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
find_package(GeckoSDK 4.3.0 REQUIRED)
find_package(GeckoSDK 2024.6.0 REQUIRED)

add_subdirectory(components)
add_subdirectory(applications)
4 changes: 3 additions & 1 deletion applications/aox/applications/aoxpc/aoxpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,9 @@ void aoa_db_on_tag_added(aoa_db_entry_t *tag)
return;
}

ec = aoa_init_rtl((aoa_state_t *)tag->user_data, locator_unid);
ec = aoa_init_rtl((aoa_state_t *)tag->user_data,
locator_unid,
sl_log_get_level() == SL_LOG_DEBUG);
if (ec != SL_RTL_ERROR_SUCCESS) {
sl_log_critical(LOG_TAG, "aoa_init_rtl failed: %d", ec);
panic();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ PROCESS_THREAD(ncp_process, ev, data)
case PROCESS_EVENT_INIT:
ncp_flush();
sl_log_info(LOG_TAG, "Reset NCP");
sl_bt_system_reset(sl_bt_system_boot_mode_normal);
sl_bt_system_reboot();
break;
case BT_EVENT:
if (NULL != ncp_bt_on_event) {
Expand All @@ -62,7 +62,7 @@ PROCESS_THREAD(ncp_process, ev, data)
free(data);
break;
case BT_RESET:
sl_bt_system_reset(sl_bt_system_boot_mode_normal);
sl_bt_system_reboot();
break;
}
PROCESS_WAIT_EVENT();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,17 @@ static void update_progress(size_t uploaded_size, size_t total_size)
printf("\r%zu/%zu (%d%%)", uploaded_size, total_size, percentage);
}

static sl_status_t system_reset(uint8_t boot_mode) {
static sl_status_t system_reset(bool dfu) {
sl_status_t sc;
sl_bt_msg_t evt;
uint32_t expected_event, received_event;

switch (boot_mode) {
case sl_bt_system_boot_mode_normal:
expected_event = sl_bt_evt_system_boot_id;
sl_bt_system_reset(boot_mode);
break;
case sl_bt_system_boot_mode_uart_dfu:
expected_event = sl_bt_evt_dfu_boot_id;
sl_bt_user_reset_to_dfu();
break;
default:
// Unsupported boot mode
return SL_STATUS_INVALID_PARAMETER;
break;
if (dfu) {
expected_event = sl_bt_evt_dfu_boot_id;
sl_bt_user_reset_to_dfu();
} else {
expected_event = sl_bt_evt_system_boot_id;
sl_bt_system_reboot();
}

sc = sl_bt_wait_event(&evt);
Expand Down Expand Up @@ -90,10 +83,10 @@ sl_status_t aoxpc_ncp_update_fixt_setup()

if (do_ncp_update || ncp_version) {
// Just print the firmware version
(void)system_reset(sl_bt_system_boot_mode_normal);
(void)system_reset(false);

if (do_ncp_update) {
if (system_reset(sl_bt_system_boot_mode_uart_dfu) != SL_STATUS_OK) {
if (system_reset(true) != SL_STATUS_OK) {
return SL_STATUS_FAIL;
}
sl_log_info(LOG_TAG, "Pressing Crtl+C aborts the update process.");
Expand All @@ -105,7 +98,7 @@ sl_status_t aoxpc_ncp_update_fixt_setup()

if (sc == SL_STATUS_OK) {
sl_log_info(LOG_TAG, "DFU finished successfully. Resetting the device.");
if (system_reset(sl_bt_system_boot_mode_normal) != SL_STATUS_OK) {
if (system_reset(false) != SL_STATUS_OK) {
return SL_STATUS_FAIL;
}
} else {
Expand Down
6 changes: 5 additions & 1 deletion applications/aox/applications/aoxpc/release_notes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# AoXPC Release Notes

## [1.3.2] - Jun 2023

## [1.6.0] - Aug 2024

* Reference platform updated to Bookworm 64-bit based Raspberry Pi OS.
* Migrated to [Bluetooth SDK](https://www.silabs.com/documents/public/release-notes/bt-software-release-notes-8.0.0.0.pdf) and [Bluetooth Location Services] (https://www.silabs.com/documents/public/release-notes/bt-rtl-library-release-notes-8.0.0.0.pdf)

## [1.3.1] - Mar 2023

Expand Down
5 changes: 5 additions & 0 deletions applications/aox/applications/positioning/release_notes.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# AoX Positioning application Release Notes

## [1.6.0] - Aug 2023

* Reference platform updated to Bookworm 64-bit based Raspberry Pi OS.
* Migrated to [Bluetooth SDK](https://www.silabs.com/documents/public/release-notes/bt-software-release-notes-8.0.0.0.pdf) and [Bluetooth Location Services] (https://www.silabs.com/documents/public/release-notes/bt-rtl-library-release-notes-8.0.0.0.pdf)

## [1.3.2] - Jun 2023

## [1.3.1] - Mar 2023
Expand Down
25 changes: 24 additions & 1 deletion applications/aox/components/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
add_subdirectory(app_log_wrapper)
add_subdirectory(rtl_lib)
add_subdirectory(ucl_mqtt_helper)

# Components from GSDK
Expand Down Expand Up @@ -85,3 +84,27 @@ 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/release/gcc/${SYSTEM_PROCESSOR}/${SYSTEM_NAME}/libaox_static.a
INTERFACE_INCLUDE_DIRECTORIES ${GeckoSDK_ROOT_DIR}/util/silicon_labs/aox/inc
INTERFACE_COMPILE_DEFINITIONS "RTL_LIB"
)
23 changes: 0 additions & 23 deletions applications/aox/components/rtl_lib/CMakeLists.txt

This file was deleted.

5 changes: 0 additions & 5 deletions applications/aox/components/rtl_lib/inc/license.txt

This file was deleted.

Loading

0 comments on commit 954fdce

Please sign in to comment.