From 08b67b113010125cebedb8ab2290a7566339e689 Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Tue, 6 Aug 2024 09:40:26 -0400 Subject: [PATCH] Gecko SDK 4.4.3 (#78) * Bump Dockerfile URL to 4.4.3 * Upgrade ot-rcp * Upgrade bootloader-uart-xmodem * Upgrade firmware eraser * Use correct path to postbuild script * Upgrade ncp-uart-hw * Update rcp-uart-802154 as well * Upgrade zwave_ncp_serial_api_controller --- Dockerfile | 8 +- misc/firmware-eraser/.cproject | 14 +- misc/firmware-eraser/config/pin_config.h | 16 +++ .../config/sl_board_control_config.h | 2 +- .../config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 17 ++- misc/firmware-eraser/firmware-eraser.pintool | 2 +- misc/firmware-eraser/firmware-eraser.slcp | 4 +- misc/firmware-eraser/firmware-eraser.slps | 3 +- src/bootloader-uart-xmodem/.cproject | 6 +- .../bootloader-uart-xmodem.pintool | 2 +- .../bootloader-uart-xmodem.slcp | 2 +- .../bootloader-uart-xmodem.slps | 3 +- .../config/btl_debug_cfg.h | 2 +- .../config/btl_gpio_activation_cfg.h | 2 +- .../config/btl_uart_driver_cfg.h | 2 +- src/ncp-uart-hw/.cproject | 133 +++++++++++++++++- src/ncp-uart-hw/config/pin_config.h | 16 +++ .../config/sl_board_control_config.h | 2 +- src/ncp-uart-hw/config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 17 ++- .../config/sl_iostream_usart_vcom_config.h | 2 +- .../config/sl_rail_util_pti_config.h | 2 +- src/ncp-uart-hw/ncp-uart-hw.pintool | 2 +- src/ncp-uart-hw/ncp-uart-hw.slcp | 2 +- src/ncp-uart-hw/ncp-uart-hw.slps | 3 +- src/ot-rcp/.cproject | 6 +- src/ot-rcp/config/pin_config.h | 16 +++ src/ot-rcp/config/sl_board_control_config.h | 2 +- src/ot-rcp/config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 17 ++- src/ot-rcp/config/sl_rail_util_pti_config.h | 2 +- .../config/sl_uartdrv_usart_vcom_config.h | 2 +- src/ot-rcp/ot-rcp.pintool | 2 +- src/ot-rcp/ot-rcp.slcp | 4 +- src/ot-rcp/ot-rcp.slps | 3 +- src/rcp-uart-802154/.cproject | 6 +- src/rcp-uart-802154/config/pin_config.h | 16 +++ .../config/sl_board_control_config.h | 2 +- .../sl_cpc_drv_uart_usart_vcom_config.h | 3 +- .../config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 17 ++- .../config/sl_rail_util_pti_config.h | 2 +- src/rcp-uart-802154/config/ustimer_config.h | 2 +- src/rcp-uart-802154/rcp-uart-802154.pintool | 2 +- src/rcp-uart-802154/rcp-uart-802154.slcp | 4 +- src/rcp-uart-802154/rcp-uart-802154.slps | 3 +- src/zwave_ncp_serial_api_controller/.cproject | 18 +-- .../extension_board_8029a_efr32xg13_button.h | 7 +- .../extension_board_8029a_efr32xg13_led.h | 5 +- .../extension_board_8029a_efr32xg13_slider.h | 4 +- .../config/serial_api_config.h | 2 +- .../config/sl_board_control_config.h | 2 +- .../config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_hfxo_config.h | 4 +- .../zwave_ncp_serial_api_controller.pintool | 2 +- .../zwave_ncp_serial_api_controller.slcp | 4 +- .../zwave_ncp_serial_api_controller.slps | 3 +- 58 files changed, 319 insertions(+), 117 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9ac41213..2ebb30c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,11 +51,11 @@ RUN \ && tar -C /opt -xf gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 \ && rm gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2 -# Gecko SDK 4.4.2 +# Gecko SDK 4.4.3 RUN \ - curl -o gecko_sdk_4.4.2.zip -L https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.2/gecko-sdk.zip \ - && unzip -q -d gecko_sdk_4.4.2 gecko_sdk_4.4.2.zip \ - && rm gecko_sdk_4.4.2.zip + curl -o gecko_sdk_4.4.3.zip -L https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.3/gecko-sdk.zip \ + && unzip -q -d gecko_sdk_4.4.3 gecko_sdk_4.4.3.zip \ + && rm gecko_sdk_4.4.3.zip # Gecko SDK 4.3.1 RUN \ diff --git a/misc/firmware-eraser/.cproject b/misc/firmware-eraser/.cproject index e43de06c..b18de704 100644 --- a/misc/firmware-eraser/.cproject +++ b/misc/firmware-eraser/.cproject @@ -4,7 +4,7 @@ - + @@ -23,9 +23,9 @@ - + - + - + - + diff --git a/misc/firmware-eraser/config/pin_config.h b/misc/firmware-eraser/config/pin_config.h index 4b558eb2..b20910de 100644 --- a/misc/firmware-eraser/config/pin_config.h +++ b/misc/firmware-eraser/config/pin_config.h @@ -5,6 +5,22 @@ // [CMU]$ // $[LFXO] +// LFXO LFXTAL_I on PD01 +#ifndef LFXO_LFXTAL_I_PORT +#define LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_I_PIN +#define LFXO_LFXTAL_I_PIN 1 +#endif + +// LFXO LFXTAL_O on PD00 +#ifndef LFXO_LFXTAL_O_PORT +#define LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_O_PIN +#define LFXO_LFXTAL_O_PIN 0 +#endif + // [LFXO]$ // $[PRS.ASYNCH0] diff --git a/misc/firmware-eraser/config/sl_board_control_config.h b/misc/firmware-eraser/config/sl_board_control_config.h index f661afa0..b5a16b94 100644 --- a/misc/firmware-eraser/config/sl_board_control_config.h +++ b/misc/firmware-eraser/config/sl_board_control_config.h @@ -53,4 +53,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file +#endif // SL_BOARD_CONTROL_CONFIG_H diff --git a/misc/firmware-eraser/config/sl_debug_swo_config.h b/misc/firmware-eraser/config/sl_debug_swo_config.h index f22934ac..fee7e65d 100644 --- a/misc/firmware-eraser/config/sl_debug_swo_config.h +++ b/misc/firmware-eraser/config/sl_debug_swo_config.h @@ -103,4 +103,4 @@ // [GPIO_SL_DEBUG]$ // <<< sl:end pin_tool >>> -#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file +#endif // SL_DEBUG_SWO_CONFIG_H diff --git a/misc/firmware-eraser/config/sl_device_init_lfxo_config.h b/misc/firmware-eraser/config/sl_device_init_lfxo_config.h index 29371b6c..d2cd25f5 100644 --- a/misc/firmware-eraser/config/sl_device_init_lfxo_config.h +++ b/misc/firmware-eraser/config/sl_device_init_lfxo_config.h @@ -66,23 +66,28 @@ // <<< sl:start pin_tool >>> // SL_DEVICE_INIT_LFXO // $[LFXO_SL_DEVICE_INIT_LFXO] +#ifndef SL_DEVICE_INIT_LFXO_PERIPHERAL #define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO +#endif // LFXO LFXTAL_O on PD00 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 +#endif // LFXO LFXTAL_I on PD01 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 - +#endif // [LFXO_SL_DEVICE_INIT_LFXO]$ -// $[LFXO_EXTERNAL_DIGITAL_CLOCK] -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PORT gpioPortD -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PIN 1 -// [LFXO_EXTERNAL_DIGITAL_CLOCK]$ // <<< sl:end pin_tool >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H \ No newline at end of file +#endif // SL_DEVICE_INIT_LFXO_CONFIG_H diff --git a/misc/firmware-eraser/firmware-eraser.pintool b/misc/firmware-eraser/firmware-eraser.pintool index 4730c361..367a595d 100644 --- a/misc/firmware-eraser/firmware-eraser.pintool +++ b/misc/firmware-eraser/firmware-eraser.pintool @@ -1,5 +1,5 @@ - + diff --git a/misc/firmware-eraser/firmware-eraser.slcp b/misc/firmware-eraser/firmware-eraser.slcp index 58036c1b..77c503db 100644 --- a/misc/firmware-eraser/firmware-eraser.slcp +++ b/misc/firmware-eraser/firmware-eraser.slcp @@ -19,10 +19,10 @@ source: - {path: app.cpp} - {path: main.cpp} include: -- path: '' +- path: . file_list: - {path: app.h} -sdk: {id: gecko_sdk, version: 4.4.2} +sdk: {id: gecko_sdk, version: 4.4.3} toolchain_settings: [] component: - {id: EFR32MG21A010F1024IM32} diff --git a/misc/firmware-eraser/firmware-eraser.slps b/misc/firmware-eraser/firmware-eraser.slps index b0409ce9..c4eecd63 100644 --- a/misc/firmware-eraser/firmware-eraser.slps +++ b/misc/firmware-eraser/firmware-eraser.slps @@ -1,7 +1,7 @@ - + @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/.cproject b/src/bootloader-uart-xmodem/.cproject index bdab046b..5c14b55e 100644 --- a/src/bootloader-uart-xmodem/.cproject +++ b/src/bootloader-uart-xmodem/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -245,7 +245,7 @@ - + diff --git a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.pintool b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.pintool index 4963aa39..c30c9c17 100644 --- a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.pintool +++ b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.pintool @@ -1,5 +1,5 @@ - + diff --git a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp index 5c191301..5081647f 100644 --- a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp +++ b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp @@ -15,7 +15,7 @@ package: bootloader quality: production readme: - {path: readme.md} -sdk: {id: gecko_sdk, version: 4.4.2} +sdk: {id: gecko_sdk, version: 4.4.3} toolchain_settings: [] component: - {id: EFR32MG21A010F1024IM32} diff --git a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps index 2cbc35df..bda4eab3 100644 --- a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps +++ b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps @@ -1,7 +1,7 @@ - + @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/btl_debug_cfg.h b/src/bootloader-uart-xmodem/config/btl_debug_cfg.h index 300821a2..a80201d5 100644 --- a/src/bootloader-uart-xmodem/config/btl_debug_cfg.h +++ b/src/bootloader-uart-xmodem/config/btl_debug_cfg.h @@ -49,4 +49,4 @@ // [GPIO_SL_DEBUG]$ // <<< sl:end pin_tool >>> -#endif // BTL_DEBUG_CONFIG_H \ No newline at end of file +#endif // BTL_DEBUG_CONFIG_H diff --git a/src/bootloader-uart-xmodem/config/btl_gpio_activation_cfg.h b/src/bootloader-uart-xmodem/config/btl_gpio_activation_cfg.h index 7df641be..b85697a1 100644 --- a/src/bootloader-uart-xmodem/config/btl_gpio_activation_cfg.h +++ b/src/bootloader-uart-xmodem/config/btl_gpio_activation_cfg.h @@ -47,4 +47,4 @@ // <<< sl:end pin_tool >>> -#endif // BTL_GPIO_ACTIVATION_CONFIG_H \ No newline at end of file +#endif // BTL_GPIO_ACTIVATION_CONFIG_H diff --git a/src/bootloader-uart-xmodem/config/btl_uart_driver_cfg.h b/src/bootloader-uart-xmodem/config/btl_uart_driver_cfg.h index 46220e0d..7f5ab91f 100644 --- a/src/bootloader-uart-xmodem/config/btl_uart_driver_cfg.h +++ b/src/bootloader-uart-xmodem/config/btl_uart_driver_cfg.h @@ -105,4 +105,4 @@ // <<< sl:end pin_tool >>> -#endif // BTL_UART_DRIVER_CONFIG_H \ No newline at end of file +#endif // BTL_UART_DRIVER_CONFIG_H diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject index 6f295900..0f1c0557 100644 --- a/src/ncp-uart-hw/.cproject +++ b/src/ncp-uart-hw/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -195,6 +195,116 @@ + + + + + + + + - + + + + + + - - \ No newline at end of file diff --git a/src/ncp-uart-hw/config/pin_config.h b/src/ncp-uart-hw/config/pin_config.h index ceb0ee66..552874a5 100644 --- a/src/ncp-uart-hw/config/pin_config.h +++ b/src/ncp-uart-hw/config/pin_config.h @@ -5,6 +5,22 @@ // [CMU]$ // $[LFXO] +// LFXO LFXTAL_I on PD01 +#ifndef LFXO_LFXTAL_I_PORT +#define LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_I_PIN +#define LFXO_LFXTAL_I_PIN 1 +#endif + +// LFXO LFXTAL_O on PD00 +#ifndef LFXO_LFXTAL_O_PORT +#define LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_O_PIN +#define LFXO_LFXTAL_O_PIN 0 +#endif + // [LFXO]$ // $[PRS.ASYNCH0] diff --git a/src/ncp-uart-hw/config/sl_board_control_config.h b/src/ncp-uart-hw/config/sl_board_control_config.h index 4b062b7c..f1804587 100644 --- a/src/ncp-uart-hw/config/sl_board_control_config.h +++ b/src/ncp-uart-hw/config/sl_board_control_config.h @@ -53,4 +53,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file +#endif // SL_BOARD_CONTROL_CONFIG_H diff --git a/src/ncp-uart-hw/config/sl_debug_swo_config.h b/src/ncp-uart-hw/config/sl_debug_swo_config.h index f22934ac..fee7e65d 100644 --- a/src/ncp-uart-hw/config/sl_debug_swo_config.h +++ b/src/ncp-uart-hw/config/sl_debug_swo_config.h @@ -103,4 +103,4 @@ // [GPIO_SL_DEBUG]$ // <<< sl:end pin_tool >>> -#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file +#endif // SL_DEBUG_SWO_CONFIG_H diff --git a/src/ncp-uart-hw/config/sl_device_init_lfxo_config.h b/src/ncp-uart-hw/config/sl_device_init_lfxo_config.h index 29371b6c..d2cd25f5 100644 --- a/src/ncp-uart-hw/config/sl_device_init_lfxo_config.h +++ b/src/ncp-uart-hw/config/sl_device_init_lfxo_config.h @@ -66,23 +66,28 @@ // <<< sl:start pin_tool >>> // SL_DEVICE_INIT_LFXO // $[LFXO_SL_DEVICE_INIT_LFXO] +#ifndef SL_DEVICE_INIT_LFXO_PERIPHERAL #define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO +#endif // LFXO LFXTAL_O on PD00 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 +#endif // LFXO LFXTAL_I on PD01 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 - +#endif // [LFXO_SL_DEVICE_INIT_LFXO]$ -// $[LFXO_EXTERNAL_DIGITAL_CLOCK] -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PORT gpioPortD -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PIN 1 -// [LFXO_EXTERNAL_DIGITAL_CLOCK]$ // <<< sl:end pin_tool >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H \ No newline at end of file +#endif // SL_DEVICE_INIT_LFXO_CONFIG_H diff --git a/src/ncp-uart-hw/config/sl_iostream_usart_vcom_config.h b/src/ncp-uart-hw/config/sl_iostream_usart_vcom_config.h index ada07a34..d622f20a 100644 --- a/src/ncp-uart-hw/config/sl_iostream_usart_vcom_config.h +++ b/src/ncp-uart-hw/config/sl_iostream_usart_vcom_config.h @@ -125,4 +125,4 @@ // [USART_SL_IOSTREAM_USART_VCOM]$ // <<< sl:end pin_tool >>> -#endif \ No newline at end of file +#endif diff --git a/src/ncp-uart-hw/config/sl_rail_util_pti_config.h b/src/ncp-uart-hw/config/sl_rail_util_pti_config.h index 60f713a3..de9d71ae 100644 --- a/src/ncp-uart-hw/config/sl_rail_util_pti_config.h +++ b/src/ncp-uart-hw/config/sl_rail_util_pti_config.h @@ -79,4 +79,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_RAIL_UTIL_PTI_CONFIG_H \ No newline at end of file +#endif // SL_RAIL_UTIL_PTI_CONFIG_H diff --git a/src/ncp-uart-hw/ncp-uart-hw.pintool b/src/ncp-uart-hw/ncp-uart-hw.pintool index 4730c361..367a595d 100644 --- a/src/ncp-uart-hw/ncp-uart-hw.pintool +++ b/src/ncp-uart-hw/ncp-uart-hw.pintool @@ -1,5 +1,5 @@ - + diff --git a/src/ncp-uart-hw/ncp-uart-hw.slcp b/src/ncp-uart-hw/ncp-uart-hw.slcp index 72d95dac..b6601f9b 100644 --- a/src/ncp-uart-hw/ncp-uart-hw.slcp +++ b/src/ncp-uart-hw/ncp-uart-hw.slcp @@ -26,7 +26,7 @@ source: - {path: main.c} - {path: app.c} tag: [prebuilt_demo] -sdk: {id: gecko_sdk, version: 4.4.2} +sdk: {id: gecko_sdk, version: 4.4.3} toolchain_settings: [] component: - {id: EFR32MG21A010F1024IM32} diff --git a/src/ncp-uart-hw/ncp-uart-hw.slps b/src/ncp-uart-hw/ncp-uart-hw.slps index 113b53a9..10bf5b58 100644 --- a/src/ncp-uart-hw/ncp-uart-hw.slps +++ b/src/ncp-uart-hw/ncp-uart-hw.slps @@ -1,7 +1,7 @@ - + @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/src/ot-rcp/.cproject b/src/ot-rcp/.cproject index ddf40559..bed3f49b 100644 --- a/src/ot-rcp/.cproject +++ b/src/ot-rcp/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -445,7 +445,7 @@ - + diff --git a/src/ot-rcp/config/pin_config.h b/src/ot-rcp/config/pin_config.h index ceb0ee66..552874a5 100644 --- a/src/ot-rcp/config/pin_config.h +++ b/src/ot-rcp/config/pin_config.h @@ -5,6 +5,22 @@ // [CMU]$ // $[LFXO] +// LFXO LFXTAL_I on PD01 +#ifndef LFXO_LFXTAL_I_PORT +#define LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_I_PIN +#define LFXO_LFXTAL_I_PIN 1 +#endif + +// LFXO LFXTAL_O on PD00 +#ifndef LFXO_LFXTAL_O_PORT +#define LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_O_PIN +#define LFXO_LFXTAL_O_PIN 0 +#endif + // [LFXO]$ // $[PRS.ASYNCH0] diff --git a/src/ot-rcp/config/sl_board_control_config.h b/src/ot-rcp/config/sl_board_control_config.h index 4b062b7c..f1804587 100644 --- a/src/ot-rcp/config/sl_board_control_config.h +++ b/src/ot-rcp/config/sl_board_control_config.h @@ -53,4 +53,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file +#endif // SL_BOARD_CONTROL_CONFIG_H diff --git a/src/ot-rcp/config/sl_debug_swo_config.h b/src/ot-rcp/config/sl_debug_swo_config.h index f22934ac..fee7e65d 100644 --- a/src/ot-rcp/config/sl_debug_swo_config.h +++ b/src/ot-rcp/config/sl_debug_swo_config.h @@ -103,4 +103,4 @@ // [GPIO_SL_DEBUG]$ // <<< sl:end pin_tool >>> -#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file +#endif // SL_DEBUG_SWO_CONFIG_H diff --git a/src/ot-rcp/config/sl_device_init_lfxo_config.h b/src/ot-rcp/config/sl_device_init_lfxo_config.h index 29371b6c..d2cd25f5 100644 --- a/src/ot-rcp/config/sl_device_init_lfxo_config.h +++ b/src/ot-rcp/config/sl_device_init_lfxo_config.h @@ -66,23 +66,28 @@ // <<< sl:start pin_tool >>> // SL_DEVICE_INIT_LFXO // $[LFXO_SL_DEVICE_INIT_LFXO] +#ifndef SL_DEVICE_INIT_LFXO_PERIPHERAL #define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO +#endif // LFXO LFXTAL_O on PD00 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 +#endif // LFXO LFXTAL_I on PD01 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 - +#endif // [LFXO_SL_DEVICE_INIT_LFXO]$ -// $[LFXO_EXTERNAL_DIGITAL_CLOCK] -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PORT gpioPortD -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PIN 1 -// [LFXO_EXTERNAL_DIGITAL_CLOCK]$ // <<< sl:end pin_tool >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H \ No newline at end of file +#endif // SL_DEVICE_INIT_LFXO_CONFIG_H diff --git a/src/ot-rcp/config/sl_rail_util_pti_config.h b/src/ot-rcp/config/sl_rail_util_pti_config.h index 60f713a3..de9d71ae 100644 --- a/src/ot-rcp/config/sl_rail_util_pti_config.h +++ b/src/ot-rcp/config/sl_rail_util_pti_config.h @@ -79,4 +79,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_RAIL_UTIL_PTI_CONFIG_H \ No newline at end of file +#endif // SL_RAIL_UTIL_PTI_CONFIG_H diff --git a/src/ot-rcp/config/sl_uartdrv_usart_vcom_config.h b/src/ot-rcp/config/sl_uartdrv_usart_vcom_config.h index eada65c2..56faf848 100644 --- a/src/ot-rcp/config/sl_uartdrv_usart_vcom_config.h +++ b/src/ot-rcp/config/sl_uartdrv_usart_vcom_config.h @@ -130,4 +130,4 @@ // [USART_SL_UARTDRV_USART_VCOM]$ // <<< sl:end pin_tool >>> -#endif // SL_UARTDRV_USART_VCOM_CONFIG_H \ No newline at end of file +#endif // SL_UARTDRV_USART_VCOM_CONFIG_H diff --git a/src/ot-rcp/ot-rcp.pintool b/src/ot-rcp/ot-rcp.pintool index f107630b..6aef5b4c 100644 --- a/src/ot-rcp/ot-rcp.pintool +++ b/src/ot-rcp/ot-rcp.pintool @@ -1,5 +1,5 @@ - + diff --git a/src/ot-rcp/ot-rcp.slcp b/src/ot-rcp/ot-rcp.slcp index 47207f7d..5a53aa08 100644 --- a/src/ot-rcp/ot-rcp.slcp +++ b/src/ot-rcp/ot-rcp.slcp @@ -20,11 +20,11 @@ source: - {path: app.c} tag: [prebuilt_demo] include: -- path: '' +- path: . file_list: - {path: app.h} - {path: reset_util.h} -sdk: {id: gecko_sdk, version: 4.4.2} +sdk: {id: gecko_sdk, version: 4.4.3} toolchain_settings: [] component: - {id: EFR32MG21A010F1024IM32} diff --git a/src/ot-rcp/ot-rcp.slps b/src/ot-rcp/ot-rcp.slps index c081112c..2e2281b4 100644 --- a/src/ot-rcp/ot-rcp.slps +++ b/src/ot-rcp/ot-rcp.slps @@ -1,7 +1,7 @@ - + @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/src/rcp-uart-802154/.cproject b/src/rcp-uart-802154/.cproject index a720332e..75846ce3 100644 --- a/src/rcp-uart-802154/.cproject +++ b/src/rcp-uart-802154/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -499,7 +499,7 @@ - + diff --git a/src/rcp-uart-802154/config/pin_config.h b/src/rcp-uart-802154/config/pin_config.h index ceb0ee66..552874a5 100644 --- a/src/rcp-uart-802154/config/pin_config.h +++ b/src/rcp-uart-802154/config/pin_config.h @@ -5,6 +5,22 @@ // [CMU]$ // $[LFXO] +// LFXO LFXTAL_I on PD01 +#ifndef LFXO_LFXTAL_I_PORT +#define LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_I_PIN +#define LFXO_LFXTAL_I_PIN 1 +#endif + +// LFXO LFXTAL_O on PD00 +#ifndef LFXO_LFXTAL_O_PORT +#define LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef LFXO_LFXTAL_O_PIN +#define LFXO_LFXTAL_O_PIN 0 +#endif + // [LFXO]$ // $[PRS.ASYNCH0] diff --git a/src/rcp-uart-802154/config/sl_board_control_config.h b/src/rcp-uart-802154/config/sl_board_control_config.h index 4b062b7c..f1804587 100644 --- a/src/rcp-uart-802154/config/sl_board_control_config.h +++ b/src/rcp-uart-802154/config/sl_board_control_config.h @@ -53,4 +53,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file +#endif // SL_BOARD_CONTROL_CONFIG_H diff --git a/src/rcp-uart-802154/config/sl_cpc_drv_uart_usart_vcom_config.h b/src/rcp-uart-802154/config/sl_cpc_drv_uart_usart_vcom_config.h index 17a37eec..381b2e02 100644 --- a/src/rcp-uart-802154/config/sl_cpc_drv_uart_usart_vcom_config.h +++ b/src/rcp-uart-802154/config/sl_cpc_drv_uart_usart_vcom_config.h @@ -29,7 +29,6 @@ ******************************************************************************/ // <<< Use Configuration Wizard in Context Menu >>> - #ifndef SL_CPC_DRV_UART_USART_VCOM_CONFIG_H #define SL_CPC_DRV_UART_USART_VCOM_CONFIG_H @@ -100,4 +99,4 @@ // [USART_SL_CPC_DRV_UART_VCOM]$ // <<< sl:end pin_tool >>> -#endif /* SL_CPC_DRV_UART_VCOM_CONFIG_H */ \ No newline at end of file +#endif /* SL_CPC_DRV_UART_VCOM_CONFIG_H */ diff --git a/src/rcp-uart-802154/config/sl_debug_swo_config.h b/src/rcp-uart-802154/config/sl_debug_swo_config.h index f22934ac..fee7e65d 100644 --- a/src/rcp-uart-802154/config/sl_debug_swo_config.h +++ b/src/rcp-uart-802154/config/sl_debug_swo_config.h @@ -103,4 +103,4 @@ // [GPIO_SL_DEBUG]$ // <<< sl:end pin_tool >>> -#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file +#endif // SL_DEBUG_SWO_CONFIG_H diff --git a/src/rcp-uart-802154/config/sl_device_init_lfxo_config.h b/src/rcp-uart-802154/config/sl_device_init_lfxo_config.h index 29371b6c..d2cd25f5 100644 --- a/src/rcp-uart-802154/config/sl_device_init_lfxo_config.h +++ b/src/rcp-uart-802154/config/sl_device_init_lfxo_config.h @@ -66,23 +66,28 @@ // <<< sl:start pin_tool >>> // SL_DEVICE_INIT_LFXO // $[LFXO_SL_DEVICE_INIT_LFXO] +#ifndef SL_DEVICE_INIT_LFXO_PERIPHERAL #define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO +#endif // LFXO LFXTAL_O on PD00 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 +#endif // LFXO LFXTAL_I on PD01 +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#endif +#ifndef SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN #define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 - +#endif // [LFXO_SL_DEVICE_INIT_LFXO]$ -// $[LFXO_EXTERNAL_DIGITAL_CLOCK] -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PORT gpioPortD -#define SL_DEVICE_INIT_LFXO_LF_EXTCLK_PIN 1 -// [LFXO_EXTERNAL_DIGITAL_CLOCK]$ // <<< sl:end pin_tool >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H \ No newline at end of file +#endif // SL_DEVICE_INIT_LFXO_CONFIG_H diff --git a/src/rcp-uart-802154/config/sl_rail_util_pti_config.h b/src/rcp-uart-802154/config/sl_rail_util_pti_config.h index 60f713a3..de9d71ae 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_pti_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_pti_config.h @@ -79,4 +79,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_RAIL_UTIL_PTI_CONFIG_H \ No newline at end of file +#endif // SL_RAIL_UTIL_PTI_CONFIG_H diff --git a/src/rcp-uart-802154/config/ustimer_config.h b/src/rcp-uart-802154/config/ustimer_config.h index 635b5487..b50a57f7 100644 --- a/src/rcp-uart-802154/config/ustimer_config.h +++ b/src/rcp-uart-802154/config/ustimer_config.h @@ -52,4 +52,4 @@ /** @} (end addtogroup ustimer) */ -#endif /* __SILICON_LABS_USTIMER_CONFIG_H__ */ \ No newline at end of file +#endif /* __SILICON_LABS_USTIMER_CONFIG_H__ */ diff --git a/src/rcp-uart-802154/rcp-uart-802154.pintool b/src/rcp-uart-802154/rcp-uart-802154.pintool index 00e15f46..a3017a33 100644 --- a/src/rcp-uart-802154/rcp-uart-802154.pintool +++ b/src/rcp-uart-802154/rcp-uart-802154.pintool @@ -1,5 +1,5 @@ - + diff --git a/src/rcp-uart-802154/rcp-uart-802154.slcp b/src/rcp-uart-802154/rcp-uart-802154.slcp index 6d83c693..ed383a3e 100644 --- a/src/rcp-uart-802154/rcp-uart-802154.slcp +++ b/src/rcp-uart-802154/rcp-uart-802154.slcp @@ -22,11 +22,11 @@ source: - {path: app.c} tag: [prebuilt_demo] include: -- path: '' +- path: . file_list: - {path: app.h} - {path: reset_util.h} -sdk: {id: gecko_sdk, version: 4.4.2} +sdk: {id: gecko_sdk, version: 4.4.3} toolchain_settings: [] component: - {from: nc_efr32_watchdog, id: nc_efr32_watchdog} diff --git a/src/rcp-uart-802154/rcp-uart-802154.slps b/src/rcp-uart-802154/rcp-uart-802154.slps index eca04294..262ef26d 100644 --- a/src/rcp-uart-802154/rcp-uart-802154.slps +++ b/src/rcp-uart-802154/rcp-uart-802154.slps @@ -1,7 +1,7 @@ - + @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/.cproject b/src/zwave_ncp_serial_api_controller/.cproject index b62976c8..09078e5b 100644 --- a/src/zwave_ncp_serial_api_controller/.cproject +++ b/src/zwave_ncp_serial_api_controller/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -154,13 +154,13 @@ - + - + - + @@ -295,13 +295,13 @@ - + - + - + @@ -367,7 +367,7 @@ - + diff --git a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h index 0cc9a7a2..8e4dcc1b 100644 --- a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h +++ b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_button.h @@ -17,9 +17,7 @@ */ // <<< Use Configuration Wizard in Context Menu >>> - // Button Configuration - #define PB1_LABEL "BTN0" // Button1 ON value @@ -36,7 +34,6 @@ // 0 #define PB1_CAN_WAKEUP_EM4 0 - #define PB2_LABEL "BTN1" // Button2 ON value @@ -53,7 +50,6 @@ // 1 #define PB2_CAN_WAKEUP_EM4 1 - #define PB3_LABEL "BTN2" // Button3 ON value @@ -70,7 +66,6 @@ // 1 #define PB3_CAN_WAKEUP_EM4 1 - #define PB4_LABEL "BTN3" // Button4 ON value @@ -135,4 +130,4 @@ // <<< sl:end pin_tool >>> -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_BUTTON_H */ \ No newline at end of file +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_BUTTON_H */ diff --git a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h index a440c525..e6717eac 100644 --- a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h +++ b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_led.h @@ -17,9 +17,7 @@ */ // <<< Use Configuration Wizard in Context Menu >>> - // LED Configuration - // LED1 ON value // <0=> Active low // <1=> Active high @@ -98,7 +96,6 @@ // <<< sl:end pin_tool >>> - /*************************************************************************/ /* Configure RGB LEDs */ /*************************************************************************/ @@ -107,4 +104,4 @@ * If paired with radio board ZGM13 then the RGB on that board can be used */ -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_LED_H */ \ No newline at end of file +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_LED_H */ diff --git a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h index 68cc8856..7b13ffee 100644 --- a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h +++ b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13_slider.h @@ -12,9 +12,7 @@ /*************************************************************************/ // <<< Use Configuration Wizard in Context Menu >>> - // Slider Configuration - #define SLIDER1_LABEL "SW1" // Slider ON value @@ -49,4 +47,4 @@ // <<< sl:end pin_tool >>> -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_SLIDER_H */ \ No newline at end of file +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_SLIDER_H */ diff --git a/src/zwave_ncp_serial_api_controller/config/serial_api_config.h b/src/zwave_ncp_serial_api_controller/config/serial_api_config.h index ad4a51a3..0d025455 100644 --- a/src/zwave_ncp_serial_api_controller/config/serial_api_config.h +++ b/src/zwave_ncp_serial_api_controller/config/serial_api_config.h @@ -45,4 +45,4 @@ // <<< sl:end pin_tool >>> -#endif // SERIAL_API_CONFIG_H \ No newline at end of file +#endif // SERIAL_API_CONFIG_H diff --git a/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h b/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h index ad15ebb1..3faa30a6 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_board_control_config.h @@ -81,4 +81,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file +#endif // SL_BOARD_CONTROL_CONFIG_H diff --git a/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h b/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h index 5ed74316..75896a71 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_debug_swo_config.h @@ -106,4 +106,4 @@ // [DBG_SL_DEBUG]$ // <<< sl:end pin_tool >>> -#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file +#endif // SL_DEBUG_SWO_CONFIG_H diff --git a/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h b/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h index 102818c0..d8e42433 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_device_init_hfxo_config.h @@ -45,8 +45,8 @@ #define SL_DEVICE_INIT_HFXO_FREQ 39000000 // HFXO precision in PPM <0-65535> -// Default: 50 -#define SL_DEVICE_INIT_HFXO_PRECISION 50 +// Default: 500 +#define SL_DEVICE_INIT_HFXO_PRECISION 500 // CTUNE <0-511> // Default: 360 diff --git a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool index f9e7fb9d..11323bb0 100644 --- a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool +++ b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.pintool @@ -1,5 +1,5 @@ - + diff --git a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp index 23567535..048ff7ae 100644 --- a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp +++ b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slcp @@ -34,7 +34,7 @@ source: - {path: main.c} tag: [prebuilt_demo] include: -- path: '' +- path: . file_list: - {path: app_node_info.h} - {path: cmd_handlers.h} @@ -50,7 +50,7 @@ include: - {path: utils.h} - {path: virtual_slave_node_info.h} - {path: zaf_config_security.h} -sdk: {id: gecko_sdk, version: 4.4.2} +sdk: {id: gecko_sdk, version: 4.4.3} toolchain_settings: [] component: - {id: ZGM130S037HGN} diff --git a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps index 74bbc115..d6e7aa18 100644 --- a/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps +++ b/src/zwave_ncp_serial_api_controller/zwave_ncp_serial_api_controller.slps @@ -1,7 +1,7 @@ - + @@ -12,5 +12,6 @@ + \ No newline at end of file