From aeda7b72653364c326535070021d8bb945432b58 Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:24:37 -0400 Subject: [PATCH 1/9] Bump RCP to 4.4.2 --- src/rcp-uart-802154/.cproject | 15 ++++++-- .../config/app_properties_config.h | 2 +- .../config/btl_interface_cfg.h | 2 +- .../config/btl_interface_cfg_s2c1.h | 2 +- src/rcp-uart-802154/config/dmadrv_config.h | 2 +- .../config/emlib_core_debug_config.h | 2 +- .../config/nvm3_default_config.h | 2 +- .../config/psa_crypto_config.h | 38 ++++++++++++++++++- .../config/sl_board_control_config.h | 2 +- src/rcp-uart-802154/config/sl_cpc_config.h | 2 +- .../sl_cpc_drv_uart_usart_vcom_config.h | 3 +- .../config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_emu_config.h | 2 +- .../config/sl_device_init_hfrco_config.h | 2 +- .../config/sl_device_init_hfxo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 24 +++++++++++- .../config/sl_mbedtls_config.h | 2 +- .../config/sl_mbedtls_device_config.h | 2 +- src/rcp-uart-802154/config/sl_memory_config.h | 2 +- .../config/sl_openthread_coex_config.h | 2 +- .../config/sl_openthread_features_config.h | 2 +- .../config/sl_openthread_generic_config.h | 2 +- .../config/sl_rail_util_coex_common_config.h | 2 +- .../config/sl_rail_util_coex_config.h | 2 +- .../config/sl_rail_util_dma_config.h | 2 +- ...ieee802154_fast_channel_switching_config.h | 2 +- .../config/sl_rail_util_pa_config.h | 2 +- .../config/sl_rail_util_pti_config.h | 2 +- .../config/sl_rail_util_rf_path_config.h | 2 +- .../config/sl_rail_util_rssi_config.h | 2 +- .../config/sl_rcp_gp_interface_config.h | 2 +- .../config/sl_sleeptimer_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 | 20 +++++----- src/rcp-uart-802154/rcp-uart-802154.slps | 2 +- 36 files changed, 115 insertions(+), 47 deletions(-) diff --git a/src/rcp-uart-802154/.cproject b/src/rcp-uart-802154/.cproject index d726bd0c..4496d92d 100644 --- a/src/rcp-uart-802154/.cproject +++ b/src/rcp-uart-802154/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -141,6 +141,7 @@ + @@ -280,6 +281,7 @@ + @@ -400,6 +402,7 @@ + @@ -496,7 +499,7 @@ - + @@ -512,8 +515,14 @@ + + + + + + \ No newline at end of file diff --git a/src/rcp-uart-802154/config/app_properties_config.h b/src/rcp-uart-802154/config/app_properties_config.h index 6a6b9766..6951a569 100644 --- a/src/rcp-uart-802154/config/app_properties_config.h +++ b/src/rcp-uart-802154/config/app_properties_config.h @@ -62,4 +62,4 @@ // -#endif // APP_PROPERTIES_CONFIG_H +#endif // APP_PROPERTIES_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/btl_interface_cfg.h b/src/rcp-uart-802154/config/btl_interface_cfg.h index 8e246f80..13e09116 100644 --- a/src/rcp-uart-802154/config/btl_interface_cfg.h +++ b/src/rcp-uart-802154/config/btl_interface_cfg.h @@ -45,4 +45,4 @@ #endif // !BOOTLOADER_APPLOADER -#endif // BTL_INTERFACE_CFG_H +#endif // BTL_INTERFACE_CFG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/btl_interface_cfg_s2c1.h b/src/rcp-uart-802154/config/btl_interface_cfg_s2c1.h index c72c27b0..7f703143 100644 --- a/src/rcp-uart-802154/config/btl_interface_cfg_s2c1.h +++ b/src/rcp-uart-802154/config/btl_interface_cfg_s2c1.h @@ -278,4 +278,4 @@ | (BOOTLOADER_PPUSATD1_SEMAILBOX << _SMU_PPUSATD1_SEMAILBOX_SHIFT)) #endif // BOOTLOADER_MANUAL_OVERRIDE_SECURITY_STATE -#endif // BTL_INTERFACE_CFG_S2C1_H +#endif // BTL_INTERFACE_CFG_S2C1_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/dmadrv_config.h b/src/rcp-uart-802154/config/dmadrv_config.h index ed105e4f..be24f49d 100644 --- a/src/rcp-uart-802154/config/dmadrv_config.h +++ b/src/rcp-uart-802154/config/dmadrv_config.h @@ -23,4 +23,4 @@ // <<< end of configuration section >>> -#endif // DMADRV_CONFIG_H +#endif // DMADRV_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/emlib_core_debug_config.h b/src/rcp-uart-802154/config/emlib_core_debug_config.h index 07ee9b9e..e4a01682 100644 --- a/src/rcp-uart-802154/config/emlib_core_debug_config.h +++ b/src/rcp-uart-802154/config/emlib_core_debug_config.h @@ -42,4 +42,4 @@ // // <<< end of configuration section >>> -#endif // EM_CORE_CONFIG_H +#endif // EM_CORE_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/nvm3_default_config.h b/src/rcp-uart-802154/config/nvm3_default_config.h index 48eb5896..48218391 100644 --- a/src/rcp-uart-802154/config/nvm3_default_config.h +++ b/src/rcp-uart-802154/config/nvm3_default_config.h @@ -42,4 +42,4 @@ // <<< end of configuration section >>> -#endif // NVM3_DEFAULT_CONFIG_H +#endif // NVM3_DEFAULT_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/psa_crypto_config.h b/src/rcp-uart-802154/config/psa_crypto_config.h index 7d9144b3..a17b0efc 100644 --- a/src/rcp-uart-802154/config/psa_crypto_config.h +++ b/src/rcp-uart-802154/config/psa_crypto_config.h @@ -110,6 +110,42 @@ // +// Power optimization configuration + +// Store already-generated random bytes before putting the device to sleep +// Using the hardware TRNG (for example through psa_generate_random()) will +// consume a non-negligible amount of power. A start-up routine must pass +// and a relatively large minimum amount of random bytes will be generated. +// Use cases where the device is frequently entering EM2/EM3 and thereafter +// consumes a small amount of data from the TRNG may benefit from buffering +// the existing random bytes before putting the device to sleep. These +// buffered bytes are then consumed until exhaustion before the TRNG needs +// to be initialized and used again. +// +// NOTE: this configuration option is only applicable for devices with a +// Virtual Secure Engine (VSE), and requires the 'Power Manager' component +// to be included in the project. +// +// Default: 0 +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) + +// Number of random words to buffer before putting the device to sleep <1-63> +// This option can be used to decrease the amount of random words that +// (if enabled) are buffered before the device enters EM2/EM3. Lowering this +// number will result in less static RAM usage, but also means that the TRNG +// potentially has to be initialized more times--leading to increased power +// consumption. By default this option in configured to buffer as much TRNG +// data as possible (limited by the depth of the TRNG FIFO). +// +// NOTE: this configuration option is only applicable when +// SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP is enabled. +// +// Default: 63 +#define SL_VSE_MAX_TRNG_WORDS_BUFFERED_DURING_SLEEP (63) +// + +// + // <<< end of configuration section >>> // ----------------------------------------------------------------------------- @@ -131,4 +167,4 @@ #include "sli_psa_builtin_config_autogen.h" -#endif // PSA_CRYPTO_CONFIG_H +#endif // PSA_CRYPTO_CONFIG_H \ No newline at end of file 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 f1804587..4b062b7c 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 +#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_cpc_config.h b/src/rcp-uart-802154/config/sl_cpc_config.h index f27f4ccd..26c6fca0 100644 --- a/src/rcp-uart-802154/config/sl_cpc_config.h +++ b/src/rcp-uart-802154/config/sl_cpc_config.h @@ -80,4 +80,4 @@ // <<< end of configuration section >>> -#endif /* SL_CPC_CONFIG_H */ +#endif /* SL_CPC_CONFIG_H */ \ No newline at end of file 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 381b2e02..17a37eec 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,6 +29,7 @@ ******************************************************************************/ // <<< Use Configuration Wizard in Context Menu >>> + #ifndef SL_CPC_DRV_UART_USART_VCOM_CONFIG_H #define SL_CPC_DRV_UART_USART_VCOM_CONFIG_H @@ -99,4 +100,4 @@ // [USART_SL_CPC_DRV_UART_VCOM]$ // <<< sl:end pin_tool >>> -#endif /* SL_CPC_DRV_UART_VCOM_CONFIG_H */ +#endif /* SL_CPC_DRV_UART_VCOM_CONFIG_H */ \ No newline at end of file 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 fee7e65d..f22934ac 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 +#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_device_init_emu_config.h b/src/rcp-uart-802154/config/sl_device_init_emu_config.h index 4ac96bac..f23d055b 100644 --- a/src/rcp-uart-802154/config/sl_device_init_emu_config.h +++ b/src/rcp-uart-802154/config/sl_device_init_emu_config.h @@ -50,4 +50,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_EMU_CONFIG_H +#endif // SL_DEVICE_INIT_EMU_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_device_init_hfrco_config.h b/src/rcp-uart-802154/config/sl_device_init_hfrco_config.h index d2d99400..532885ae 100644 --- a/src/rcp-uart-802154/config/sl_device_init_hfrco_config.h +++ b/src/rcp-uart-802154/config/sl_device_init_hfrco_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H +#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_device_init_hfxo_config.h b/src/rcp-uart-802154/config/sl_device_init_hfxo_config.h index 6a35767e..917e60a6 100644 --- a/src/rcp-uart-802154/config/sl_device_init_hfxo_config.h +++ b/src/rcp-uart-802154/config/sl_device_init_hfxo_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFXO_CONFIG_H +#endif // SL_DEVICE_INIT_HFXO_CONFIG_H \ No newline at end of file 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 6bd763ba..29371b6c 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 @@ -63,4 +63,26 @@ #define SL_DEVICE_INIT_LFXO_TIMEOUT cmuLfxoStartupDelay_4KCycles // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H +// <<< sl:start pin_tool >>> +// SL_DEVICE_INIT_LFXO +// $[LFXO_SL_DEVICE_INIT_LFXO] +#define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO + +// LFXO LFXTAL_O on PD00 +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 + +// LFXO LFXTAL_I on PD01 +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 + + +// [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 diff --git a/src/rcp-uart-802154/config/sl_mbedtls_config.h b/src/rcp-uart-802154/config/sl_mbedtls_config.h index 39b51496..5ebefc9a 100644 --- a/src/rcp-uart-802154/config/sl_mbedtls_config.h +++ b/src/rcp-uart-802154/config/sl_mbedtls_config.h @@ -115,4 +115,4 @@ // Included for backward compatibility reasons. #include "mbedtls/build_info.h" -#endif // SL_MBEDTLS_CONFIG_H +#endif // SL_MBEDTLS_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_mbedtls_device_config.h b/src/rcp-uart-802154/config/sl_mbedtls_device_config.h index 33c34c42..e286a0d9 100644 --- a/src/rcp-uart-802154/config/sl_mbedtls_device_config.h +++ b/src/rcp-uart-802154/config/sl_mbedtls_device_config.h @@ -69,4 +69,4 @@ #define SL_SE_ASSUME_FW_AT_LEAST_1_2_2 1 #endif -#endif // SL_MBEDTLS_DEVICE_CONFIG_H +#endif // SL_MBEDTLS_DEVICE_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_memory_config.h b/src/rcp-uart-802154/config/sl_memory_config.h index 3710cf90..b75d56fb 100644 --- a/src/rcp-uart-802154/config/sl_memory_config.h +++ b/src/rcp-uart-802154/config/sl_memory_config.h @@ -25,4 +25,4 @@ // // <<< end of configuration section >>> -#endif +#endif \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_openthread_coex_config.h b/src/rcp-uart-802154/config/sl_openthread_coex_config.h index 8ab012b2..c43e95b9 100644 --- a/src/rcp-uart-802154/config/sl_openthread_coex_config.h +++ b/src/rcp-uart-802154/config/sl_openthread_coex_config.h @@ -8,4 +8,4 @@ #define SL_OPENTHREAD_COEX_COUNTER_ENABLE 1 // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_openthread_features_config.h b/src/rcp-uart-802154/config/sl_openthread_features_config.h index b3493cdf..bc8d7e41 100644 --- a/src/rcp-uart-802154/config/sl_openthread_features_config.h +++ b/src/rcp-uart-802154/config/sl_openthread_features_config.h @@ -324,4 +324,4 @@ // // <<< end of configuration section >>> -#endif // _SL_OPENTHREAD_FEATURES_CONFIG_H +#endif // _SL_OPENTHREAD_FEATURES_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_openthread_generic_config.h b/src/rcp-uart-802154/config/sl_openthread_generic_config.h index fd057a7f..28bbfae1 100644 --- a/src/rcp-uart-802154/config/sl_openthread_generic_config.h +++ b/src/rcp-uart-802154/config/sl_openthread_generic_config.h @@ -145,4 +145,4 @@ /* Define to the type of an unsigned integer type of width exactly 8 bits if such a type exists and the standard includes do not define it. */ -/* #undef uint8_t */ +/* #undef uint8_t */ \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rail_util_coex_common_config.h b/src/rcp-uart-802154/config/sl_rail_util_coex_common_config.h index 7cddee03..edf563dd 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_coex_common_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_coex_common_config.h @@ -251,4 +251,4 @@ // // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_COEX_COMMON_CONFIG_H +#endif // SL_RAIL_UTIL_COEX_COMMON_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rail_util_coex_config.h b/src/rcp-uart-802154/config/sl_rail_util_coex_config.h index 368ddb3a..65c1522c 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_coex_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_coex_config.h @@ -187,4 +187,4 @@ // <<< sl:end pin_tool >>> -#endif // SL_RAIL_UTIL_COEX_CONFIG_H +#endif // SL_RAIL_UTIL_COEX_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rail_util_dma_config.h b/src/rcp-uart-802154/config/sl_rail_util_dma_config.h index dcf7171c..7f97acfc 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_dma_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_dma_config.h @@ -49,4 +49,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_DMA_CONFIG_H +#endif // SL_RAIL_UTIL_DMA_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rail_util_ieee802154_fast_channel_switching_config.h b/src/rcp-uart-802154/config/sl_rail_util_ieee802154_fast_channel_switching_config.h index a4470069..374a5b66 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_ieee802154_fast_channel_switching_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_ieee802154_fast_channel_switching_config.h @@ -46,4 +46,4 @@ #define SL_RAIL_UTIL_IEEE802154_FAST_CHANNEL_SWITCHING_ENABLED 1 // // <<< end of configuration section >>> -#endif //SL_RAIL_UITL_IEEE802154_FAST_CHANNEL_SWITCHING_CONFIG_H +#endif //SL_RAIL_UITL_IEEE802154_FAST_CHANNEL_SWITCHING_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rail_util_pa_config.h b/src/rcp-uart-802154/config/sl_rail_util_pa_config.h index 357f4296..84b836c2 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_pa_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_pa_config.h @@ -78,4 +78,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_PA_CONFIG_H +#endif // SL_RAIL_UTIL_PA_CONFIG_H \ No newline at end of file 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 de9d71ae..60f713a3 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 +#endif // SL_RAIL_UTIL_PTI_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rail_util_rf_path_config.h b/src/rcp-uart-802154/config/sl_rail_util_rf_path_config.h index ca5be91c..464e91c3 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_rf_path_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_rf_path_config.h @@ -45,4 +45,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_RF_PATH_CONFIG_H +#endif // SL_RAIL_UTIL_RF_PATH_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rail_util_rssi_config.h b/src/rcp-uart-802154/config/sl_rail_util_rssi_config.h index 15a55646..1365e6e5 100644 --- a/src/rcp-uart-802154/config/sl_rail_util_rssi_config.h +++ b/src/rcp-uart-802154/config/sl_rail_util_rssi_config.h @@ -41,4 +41,4 @@ // // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_RSSI_CONFIG_H +#endif // SL_RAIL_UTIL_RSSI_CONFIG_H \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_rcp_gp_interface_config.h b/src/rcp-uart-802154/config/sl_rcp_gp_interface_config.h index cbf00dd5..db54b80d 100644 --- a/src/rcp-uart-802154/config/sl_rcp_gp_interface_config.h +++ b/src/rcp-uart-802154/config/sl_rcp_gp_interface_config.h @@ -11,4 +11,4 @@ // #define GP_TX_MAX_TIMEOUT_IN_MICRO_SECONDS 5000000 // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/rcp-uart-802154/config/sl_sleeptimer_config.h b/src/rcp-uart-802154/config/sl_sleeptimer_config.h index 8344ef5f..bba646d6 100644 --- a/src/rcp-uart-802154/config/sl_sleeptimer_config.h +++ b/src/rcp-uart-802154/config/sl_sleeptimer_config.h @@ -79,4 +79,4 @@ #endif /* SLEEPTIMER_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/rcp-uart-802154/config/ustimer_config.h b/src/rcp-uart-802154/config/ustimer_config.h index b50a57f7..635b5487 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__ */ +#endif /* __SILICON_LABS_USTIMER_CONFIG_H__ */ \ No newline at end of file diff --git a/src/rcp-uart-802154/rcp-uart-802154.pintool b/src/rcp-uart-802154/rcp-uart-802154.pintool index 69bed34a..00e15f46 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 02f8b1d8..6d83c693 100644 --- a/src/rcp-uart-802154/rcp-uart-802154.slcp +++ b/src/rcp-uart-802154/rcp-uart-802154.slcp @@ -26,22 +26,22 @@ include: file_list: - {path: app.h} - {path: reset_util.h} -sdk: {id: gecko_sdk, version: 4.4.0} +sdk: {id: gecko_sdk, version: 4.4.2} toolchain_settings: [] component: -- {id: cpc_security_secondary_none} +- {from: nc_efr32_watchdog, id: nc_efr32_watchdog} +- {id: EFR32MG21A010F1024IM32} +- {id: bootloader_interface} +- {id: brd4001a} +- {id: brd4179b} - instance: [vcom] id: cpc_secondary_driver_uart_usart +- {id: cpc_security_secondary_none} +- {id: ot_crash_handler} +- {id: ot_ncp_cpc} - {id: ot_rcp_gp_interface} -- {id: rail_util_pti} -- {id: brd4001a} - {id: ot_stack_rcp} -- {id: ot_ncp_cpc} -- {id: ot_crash_handler} -- {id: brd4179b} -- {from: nc_efr32_watchdog, id: nc_efr32_watchdog} -- {id: bootloader_interface} -- {id: EFR32MG21A010F1024IM32} +- {id: rail_util_pti} define: - {name: OPENTHREAD_CONFIG_PLATFORM_ASSERT_MANAGEMENT, value: '1'} configuration: diff --git a/src/rcp-uart-802154/rcp-uart-802154.slps b/src/rcp-uart-802154/rcp-uart-802154.slps index bf77a189..eca04294 100644 --- a/src/rcp-uart-802154/rcp-uart-802154.slps +++ b/src/rcp-uart-802154/rcp-uart-802154.slps @@ -1,7 +1,7 @@ - + From a30668d760048cb1603696a61d868e66d96add3d Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:27:05 -0400 Subject: [PATCH 2/9] Bump OT-RCP to 4.4.2 --- src/ot-rcp/.cproject | 9 +++-- src/ot-rcp/config/app_properties_config.h | 2 +- src/ot-rcp/config/btl_interface_cfg.h | 2 +- src/ot-rcp/config/btl_interface_cfg_s2c1.h | 2 +- src/ot-rcp/config/dmadrv_config.h | 2 +- src/ot-rcp/config/emlib_core_debug_config.h | 2 +- src/ot-rcp/config/nvm3_default_config.h | 2 +- src/ot-rcp/config/psa_crypto_config.h | 38 ++++++++++++++++++- src/ot-rcp/config/sl_board_control_config.h | 2 +- src/ot-rcp/config/sl_debug_swo_config.h | 2 +- src/ot-rcp/config/sl_device_init_emu_config.h | 2 +- .../config/sl_device_init_hfrco_config.h | 2 +- .../config/sl_device_init_hfxo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 24 +++++++++++- src/ot-rcp/config/sl_mbedtls_config.h | 2 +- src/ot-rcp/config/sl_mbedtls_device_config.h | 2 +- src/ot-rcp/config/sl_memory_config.h | 2 +- .../config/sl_openthread_features_config.h | 2 +- .../config/sl_openthread_generic_config.h | 2 +- src/ot-rcp/config/sl_rail_util_pa_config.h | 2 +- src/ot-rcp/config/sl_rail_util_pti_config.h | 2 +- .../config/sl_rail_util_rf_path_config.h | 2 +- src/ot-rcp/config/sl_rail_util_rssi_config.h | 2 +- src/ot-rcp/config/sl_sleeptimer_config.h | 2 +- .../config/sl_uartdrv_usart_vcom_config.h | 2 +- src/ot-rcp/config/uartdrv_config.h | 2 +- src/ot-rcp/ot-rcp.pintool | 2 +- src/ot-rcp/ot-rcp.slcp | 14 +++---- src/ot-rcp/ot-rcp.slps | 2 +- 29 files changed, 98 insertions(+), 37 deletions(-) diff --git a/src/ot-rcp/.cproject b/src/ot-rcp/.cproject index 4adc9653..7d9646a7 100644 --- a/src/ot-rcp/.cproject +++ b/src/ot-rcp/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -128,6 +128,7 @@ + @@ -248,6 +249,7 @@ + @@ -349,6 +351,7 @@ + @@ -439,7 +442,7 @@ - + diff --git a/src/ot-rcp/config/app_properties_config.h b/src/ot-rcp/config/app_properties_config.h index 6a6b9766..6951a569 100644 --- a/src/ot-rcp/config/app_properties_config.h +++ b/src/ot-rcp/config/app_properties_config.h @@ -62,4 +62,4 @@ // -#endif // APP_PROPERTIES_CONFIG_H +#endif // APP_PROPERTIES_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/btl_interface_cfg.h b/src/ot-rcp/config/btl_interface_cfg.h index 8e246f80..13e09116 100644 --- a/src/ot-rcp/config/btl_interface_cfg.h +++ b/src/ot-rcp/config/btl_interface_cfg.h @@ -45,4 +45,4 @@ #endif // !BOOTLOADER_APPLOADER -#endif // BTL_INTERFACE_CFG_H +#endif // BTL_INTERFACE_CFG_H \ No newline at end of file diff --git a/src/ot-rcp/config/btl_interface_cfg_s2c1.h b/src/ot-rcp/config/btl_interface_cfg_s2c1.h index c72c27b0..7f703143 100644 --- a/src/ot-rcp/config/btl_interface_cfg_s2c1.h +++ b/src/ot-rcp/config/btl_interface_cfg_s2c1.h @@ -278,4 +278,4 @@ | (BOOTLOADER_PPUSATD1_SEMAILBOX << _SMU_PPUSATD1_SEMAILBOX_SHIFT)) #endif // BOOTLOADER_MANUAL_OVERRIDE_SECURITY_STATE -#endif // BTL_INTERFACE_CFG_S2C1_H +#endif // BTL_INTERFACE_CFG_S2C1_H \ No newline at end of file diff --git a/src/ot-rcp/config/dmadrv_config.h b/src/ot-rcp/config/dmadrv_config.h index ed105e4f..be24f49d 100644 --- a/src/ot-rcp/config/dmadrv_config.h +++ b/src/ot-rcp/config/dmadrv_config.h @@ -23,4 +23,4 @@ // <<< end of configuration section >>> -#endif // DMADRV_CONFIG_H +#endif // DMADRV_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/emlib_core_debug_config.h b/src/ot-rcp/config/emlib_core_debug_config.h index 07ee9b9e..e4a01682 100644 --- a/src/ot-rcp/config/emlib_core_debug_config.h +++ b/src/ot-rcp/config/emlib_core_debug_config.h @@ -42,4 +42,4 @@ // // <<< end of configuration section >>> -#endif // EM_CORE_CONFIG_H +#endif // EM_CORE_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/nvm3_default_config.h b/src/ot-rcp/config/nvm3_default_config.h index 48eb5896..48218391 100644 --- a/src/ot-rcp/config/nvm3_default_config.h +++ b/src/ot-rcp/config/nvm3_default_config.h @@ -42,4 +42,4 @@ // <<< end of configuration section >>> -#endif // NVM3_DEFAULT_CONFIG_H +#endif // NVM3_DEFAULT_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/psa_crypto_config.h b/src/ot-rcp/config/psa_crypto_config.h index 7d9144b3..a17b0efc 100644 --- a/src/ot-rcp/config/psa_crypto_config.h +++ b/src/ot-rcp/config/psa_crypto_config.h @@ -110,6 +110,42 @@ // +// Power optimization configuration + +// Store already-generated random bytes before putting the device to sleep +// Using the hardware TRNG (for example through psa_generate_random()) will +// consume a non-negligible amount of power. A start-up routine must pass +// and a relatively large minimum amount of random bytes will be generated. +// Use cases where the device is frequently entering EM2/EM3 and thereafter +// consumes a small amount of data from the TRNG may benefit from buffering +// the existing random bytes before putting the device to sleep. These +// buffered bytes are then consumed until exhaustion before the TRNG needs +// to be initialized and used again. +// +// NOTE: this configuration option is only applicable for devices with a +// Virtual Secure Engine (VSE), and requires the 'Power Manager' component +// to be included in the project. +// +// Default: 0 +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) + +// Number of random words to buffer before putting the device to sleep <1-63> +// This option can be used to decrease the amount of random words that +// (if enabled) are buffered before the device enters EM2/EM3. Lowering this +// number will result in less static RAM usage, but also means that the TRNG +// potentially has to be initialized more times--leading to increased power +// consumption. By default this option in configured to buffer as much TRNG +// data as possible (limited by the depth of the TRNG FIFO). +// +// NOTE: this configuration option is only applicable when +// SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP is enabled. +// +// Default: 63 +#define SL_VSE_MAX_TRNG_WORDS_BUFFERED_DURING_SLEEP (63) +// + +// + // <<< end of configuration section >>> // ----------------------------------------------------------------------------- @@ -131,4 +167,4 @@ #include "sli_psa_builtin_config_autogen.h" -#endif // PSA_CRYPTO_CONFIG_H +#endif // PSA_CRYPTO_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_board_control_config.h b/src/ot-rcp/config/sl_board_control_config.h index f1804587..4b062b7c 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 +#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_debug_swo_config.h b/src/ot-rcp/config/sl_debug_swo_config.h index fee7e65d..f22934ac 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 +#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_device_init_emu_config.h b/src/ot-rcp/config/sl_device_init_emu_config.h index 4ac96bac..f23d055b 100644 --- a/src/ot-rcp/config/sl_device_init_emu_config.h +++ b/src/ot-rcp/config/sl_device_init_emu_config.h @@ -50,4 +50,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_EMU_CONFIG_H +#endif // SL_DEVICE_INIT_EMU_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_device_init_hfrco_config.h b/src/ot-rcp/config/sl_device_init_hfrco_config.h index d2d99400..532885ae 100644 --- a/src/ot-rcp/config/sl_device_init_hfrco_config.h +++ b/src/ot-rcp/config/sl_device_init_hfrco_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H +#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_device_init_hfxo_config.h b/src/ot-rcp/config/sl_device_init_hfxo_config.h index 6a35767e..917e60a6 100644 --- a/src/ot-rcp/config/sl_device_init_hfxo_config.h +++ b/src/ot-rcp/config/sl_device_init_hfxo_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFXO_CONFIG_H +#endif // SL_DEVICE_INIT_HFXO_CONFIG_H \ No newline at end of file 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 6bd763ba..29371b6c 100644 --- a/src/ot-rcp/config/sl_device_init_lfxo_config.h +++ b/src/ot-rcp/config/sl_device_init_lfxo_config.h @@ -63,4 +63,26 @@ #define SL_DEVICE_INIT_LFXO_TIMEOUT cmuLfxoStartupDelay_4KCycles // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H +// <<< sl:start pin_tool >>> +// SL_DEVICE_INIT_LFXO +// $[LFXO_SL_DEVICE_INIT_LFXO] +#define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO + +// LFXO LFXTAL_O on PD00 +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 + +// LFXO LFXTAL_I on PD01 +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 + + +// [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 diff --git a/src/ot-rcp/config/sl_mbedtls_config.h b/src/ot-rcp/config/sl_mbedtls_config.h index 39b51496..5ebefc9a 100644 --- a/src/ot-rcp/config/sl_mbedtls_config.h +++ b/src/ot-rcp/config/sl_mbedtls_config.h @@ -115,4 +115,4 @@ // Included for backward compatibility reasons. #include "mbedtls/build_info.h" -#endif // SL_MBEDTLS_CONFIG_H +#endif // SL_MBEDTLS_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_mbedtls_device_config.h b/src/ot-rcp/config/sl_mbedtls_device_config.h index 33c34c42..e286a0d9 100644 --- a/src/ot-rcp/config/sl_mbedtls_device_config.h +++ b/src/ot-rcp/config/sl_mbedtls_device_config.h @@ -69,4 +69,4 @@ #define SL_SE_ASSUME_FW_AT_LEAST_1_2_2 1 #endif -#endif // SL_MBEDTLS_DEVICE_CONFIG_H +#endif // SL_MBEDTLS_DEVICE_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_memory_config.h b/src/ot-rcp/config/sl_memory_config.h index b43ebcba..9acd1505 100644 --- a/src/ot-rcp/config/sl_memory_config.h +++ b/src/ot-rcp/config/sl_memory_config.h @@ -25,4 +25,4 @@ // // <<< end of configuration section >>> -#endif +#endif \ No newline at end of file diff --git a/src/ot-rcp/config/sl_openthread_features_config.h b/src/ot-rcp/config/sl_openthread_features_config.h index ed8934af..0bb69678 100644 --- a/src/ot-rcp/config/sl_openthread_features_config.h +++ b/src/ot-rcp/config/sl_openthread_features_config.h @@ -324,4 +324,4 @@ // // <<< end of configuration section >>> -#endif // _SL_OPENTHREAD_FEATURES_CONFIG_H +#endif // _SL_OPENTHREAD_FEATURES_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_openthread_generic_config.h b/src/ot-rcp/config/sl_openthread_generic_config.h index fd057a7f..28bbfae1 100644 --- a/src/ot-rcp/config/sl_openthread_generic_config.h +++ b/src/ot-rcp/config/sl_openthread_generic_config.h @@ -145,4 +145,4 @@ /* Define to the type of an unsigned integer type of width exactly 8 bits if such a type exists and the standard includes do not define it. */ -/* #undef uint8_t */ +/* #undef uint8_t */ \ No newline at end of file diff --git a/src/ot-rcp/config/sl_rail_util_pa_config.h b/src/ot-rcp/config/sl_rail_util_pa_config.h index 357f4296..84b836c2 100644 --- a/src/ot-rcp/config/sl_rail_util_pa_config.h +++ b/src/ot-rcp/config/sl_rail_util_pa_config.h @@ -78,4 +78,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_PA_CONFIG_H +#endif // SL_RAIL_UTIL_PA_CONFIG_H \ No newline at end of file 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 de9d71ae..60f713a3 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 +#endif // SL_RAIL_UTIL_PTI_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_rail_util_rf_path_config.h b/src/ot-rcp/config/sl_rail_util_rf_path_config.h index ca5be91c..464e91c3 100644 --- a/src/ot-rcp/config/sl_rail_util_rf_path_config.h +++ b/src/ot-rcp/config/sl_rail_util_rf_path_config.h @@ -45,4 +45,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_RF_PATH_CONFIG_H +#endif // SL_RAIL_UTIL_RF_PATH_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_rail_util_rssi_config.h b/src/ot-rcp/config/sl_rail_util_rssi_config.h index 15a55646..1365e6e5 100644 --- a/src/ot-rcp/config/sl_rail_util_rssi_config.h +++ b/src/ot-rcp/config/sl_rail_util_rssi_config.h @@ -41,4 +41,4 @@ // // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_RSSI_CONFIG_H +#endif // SL_RAIL_UTIL_RSSI_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/sl_sleeptimer_config.h b/src/ot-rcp/config/sl_sleeptimer_config.h index 8344ef5f..bba646d6 100644 --- a/src/ot-rcp/config/sl_sleeptimer_config.h +++ b/src/ot-rcp/config/sl_sleeptimer_config.h @@ -79,4 +79,4 @@ #endif /* SLEEPTIMER_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file 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 56faf848..eada65c2 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 +#endif // SL_UARTDRV_USART_VCOM_CONFIG_H \ No newline at end of file diff --git a/src/ot-rcp/config/uartdrv_config.h b/src/ot-rcp/config/uartdrv_config.h index e1d0a85d..e82ed6a4 100644 --- a/src/ot-rcp/config/uartdrv_config.h +++ b/src/ot-rcp/config/uartdrv_config.h @@ -111,4 +111,4 @@ /** @} (end addtogroup uartdrv) */ -#endif /* __SILICON_LABS_UARTDRV_CONFIG_H__ */ +#endif /* __SILICON_LABS_UARTDRV_CONFIG_H__ */ \ No newline at end of file diff --git a/src/ot-rcp/ot-rcp.pintool b/src/ot-rcp/ot-rcp.pintool index ab04183a..f107630b 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 bd60ae4d..dfefeb63 100644 --- a/src/ot-rcp/ot-rcp.slcp +++ b/src/ot-rcp/ot-rcp.slcp @@ -24,18 +24,18 @@ include: file_list: - {path: app.h} - {path: reset_util.h} -sdk: {id: gecko_sdk, version: 4.4.0} +sdk: {id: gecko_sdk, version: 4.4.2} toolchain_settings: [] component: +- {id: EFR32MG21A010F1024IM32} +- {id: bootloader_interface} +- {id: brd4001a} +- {id: brd4179b} +- {id: ot_crash_handler} +- {id: ot_stack_rcp} - {id: rail_util_pti} - instance: [vcom] id: uartdrv_usart -- {id: brd4001a} -- {id: ot_stack_rcp} -- {id: ot_crash_handler} -- {id: brd4179b} -- {id: bootloader_interface} -- {id: EFR32MG21A010F1024IM32} configuration: - {name: SL_BOARD_ENABLE_VCOM, value: '1'} - {name: OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE, value: '0'} diff --git a/src/ot-rcp/ot-rcp.slps b/src/ot-rcp/ot-rcp.slps index 0ebcba93..c081112c 100644 --- a/src/ot-rcp/ot-rcp.slps +++ b/src/ot-rcp/ot-rcp.slps @@ -1,7 +1,7 @@ - + From 203e80a9d5352e400a47f43543ccd14bd135adb7 Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:32:02 -0400 Subject: [PATCH 3/9] Bump NCP to 4.4.2 --- src/ncp-uart-hw/.cproject | 16 +++----- src/ncp-uart-hw/config/SEGGER_RTT_Conf.h | 2 +- .../config/app_properties_config.h | 2 +- src/ncp-uart-hw/config/btl_interface_cfg.h | 2 +- .../config/btl_interface_cfg_s2c1.h | 2 +- src/ncp-uart-hw/config/dmadrv_config.h | 2 +- .../config/emlib_core_debug_config.h | 2 +- .../config/legacy_common_ash_config.h | 2 +- src/ncp-uart-hw/config/legacy_hal_config.h | 2 +- src/ncp-uart-hw/config/nvm3_default_config.h | 2 +- src/ncp-uart-hw/config/psa_crypto_config.h | 38 ++++++++++++++++++- .../config/sl_board_control_config.h | 2 +- .../sl_custom_manufacturing_token_header.h | 2 +- .../config/sl_custom_token_header.h | 2 +- src/ncp-uart-hw/config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_emu_config.h | 2 +- .../config/sl_device_init_hfrco_config.h | 2 +- .../config/sl_device_init_hfxo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 24 +++++++++++- .../config/sl_iostream_usart_vcom_config.h | 2 +- .../config/sl_iostream_vuart_config.h | 2 +- .../config/sl_legacy_hal_wdog_config.h | 2 +- src/ncp-uart-hw/config/sl_mbedtls_config.h | 2 +- .../config/sl_mbedtls_device_config.h | 2 +- .../config/sl_power_manager_config.h | 2 +- .../config/sl_rail_util_pa_config.h | 2 +- .../sl_rail_util_power_manager_init_config.h | 2 +- .../config/sl_rail_util_pti_config.h | 2 +- .../config/sl_rail_util_rf_path_config.h | 2 +- src/ncp-uart-hw/config/sl_sleeptimer_config.h | 2 +- .../config/sl_token_manager_config.h | 2 +- .../config/sl_zigbee_debug_print_config.h | 2 +- .../config/sl_zigbee_green_power_config.h | 2 +- .../config/sl_zigbee_light_link_config.h | 2 +- .../config/sl_zigbee_pro_stack_config.h | 2 +- .../sl_zigbee_security_link_keys_config.h | 2 +- .../config/sl_zigbee_source_route_config.h | 2 +- src/ncp-uart-hw/config/zigbee_sleep_config.h | 2 +- .../zigbee_watchdog_periodic_refresh_config.h | 2 +- src/ncp-uart-hw/ncp-uart-hw.pintool | 2 +- src/ncp-uart-hw/ncp-uart-hw.slcp | 28 +++++++------- src/ncp-uart-hw/ncp-uart-hw.slps | 2 +- src/rcp-uart-802154/.cproject | 4 +- 43 files changed, 120 insertions(+), 66 deletions(-) diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject index b9b8cb1b..55474400 100644 --- a/src/ncp-uart-hw/.cproject +++ b/src/ncp-uart-hw/.cproject @@ -4,7 +4,7 @@ - + @@ -23,12 +23,12 @@ - + - - + diff --git a/src/ncp-uart-hw/config/SEGGER_RTT_Conf.h b/src/ncp-uart-hw/config/SEGGER_RTT_Conf.h index df57e166..78a5a062 100644 --- a/src/ncp-uart-hw/config/SEGGER_RTT_Conf.h +++ b/src/ncp-uart-hw/config/SEGGER_RTT_Conf.h @@ -425,4 +425,4 @@ void OS_SIM_LeaveCriticalSection(void); #endif #endif -/*************************** End of file ****************************/ +/*************************** End of file ****************************/ \ No newline at end of file diff --git a/src/ncp-uart-hw/config/app_properties_config.h b/src/ncp-uart-hw/config/app_properties_config.h index 6a6b9766..6951a569 100644 --- a/src/ncp-uart-hw/config/app_properties_config.h +++ b/src/ncp-uart-hw/config/app_properties_config.h @@ -62,4 +62,4 @@ // -#endif // APP_PROPERTIES_CONFIG_H +#endif // APP_PROPERTIES_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/btl_interface_cfg.h b/src/ncp-uart-hw/config/btl_interface_cfg.h index 8e246f80..13e09116 100644 --- a/src/ncp-uart-hw/config/btl_interface_cfg.h +++ b/src/ncp-uart-hw/config/btl_interface_cfg.h @@ -45,4 +45,4 @@ #endif // !BOOTLOADER_APPLOADER -#endif // BTL_INTERFACE_CFG_H +#endif // BTL_INTERFACE_CFG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/btl_interface_cfg_s2c1.h b/src/ncp-uart-hw/config/btl_interface_cfg_s2c1.h index c72c27b0..7f703143 100644 --- a/src/ncp-uart-hw/config/btl_interface_cfg_s2c1.h +++ b/src/ncp-uart-hw/config/btl_interface_cfg_s2c1.h @@ -278,4 +278,4 @@ | (BOOTLOADER_PPUSATD1_SEMAILBOX << _SMU_PPUSATD1_SEMAILBOX_SHIFT)) #endif // BOOTLOADER_MANUAL_OVERRIDE_SECURITY_STATE -#endif // BTL_INTERFACE_CFG_S2C1_H +#endif // BTL_INTERFACE_CFG_S2C1_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/dmadrv_config.h b/src/ncp-uart-hw/config/dmadrv_config.h index ed105e4f..be24f49d 100644 --- a/src/ncp-uart-hw/config/dmadrv_config.h +++ b/src/ncp-uart-hw/config/dmadrv_config.h @@ -23,4 +23,4 @@ // <<< end of configuration section >>> -#endif // DMADRV_CONFIG_H +#endif // DMADRV_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/emlib_core_debug_config.h b/src/ncp-uart-hw/config/emlib_core_debug_config.h index 07ee9b9e..e4a01682 100644 --- a/src/ncp-uart-hw/config/emlib_core_debug_config.h +++ b/src/ncp-uart-hw/config/emlib_core_debug_config.h @@ -42,4 +42,4 @@ // // <<< end of configuration section >>> -#endif // EM_CORE_CONFIG_H +#endif // EM_CORE_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/legacy_common_ash_config.h b/src/ncp-uart-hw/config/legacy_common_ash_config.h index ce1ad5d7..fe9ffaf4 100644 --- a/src/ncp-uart-hw/config/legacy_common_ash_config.h +++ b/src/ncp-uart-hw/config/legacy_common_ash_config.h @@ -40,4 +40,4 @@ #endif /* LEGACY_NCP_ASH_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/legacy_hal_config.h b/src/ncp-uart-hw/config/legacy_hal_config.h index e3386e94..a6d18138 100644 --- a/src/ncp-uart-hw/config/legacy_hal_config.h +++ b/src/ncp-uart-hw/config/legacy_hal_config.h @@ -44,4 +44,4 @@ #endif /* LEGACY_HAL_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/nvm3_default_config.h b/src/ncp-uart-hw/config/nvm3_default_config.h index 5f127358..df85ba9e 100644 --- a/src/ncp-uart-hw/config/nvm3_default_config.h +++ b/src/ncp-uart-hw/config/nvm3_default_config.h @@ -42,4 +42,4 @@ // <<< end of configuration section >>> -#endif // NVM3_DEFAULT_CONFIG_H +#endif // NVM3_DEFAULT_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/psa_crypto_config.h b/src/ncp-uart-hw/config/psa_crypto_config.h index 7d9144b3..a17b0efc 100644 --- a/src/ncp-uart-hw/config/psa_crypto_config.h +++ b/src/ncp-uart-hw/config/psa_crypto_config.h @@ -110,6 +110,42 @@ // +// Power optimization configuration + +// Store already-generated random bytes before putting the device to sleep +// Using the hardware TRNG (for example through psa_generate_random()) will +// consume a non-negligible amount of power. A start-up routine must pass +// and a relatively large minimum amount of random bytes will be generated. +// Use cases where the device is frequently entering EM2/EM3 and thereafter +// consumes a small amount of data from the TRNG may benefit from buffering +// the existing random bytes before putting the device to sleep. These +// buffered bytes are then consumed until exhaustion before the TRNG needs +// to be initialized and used again. +// +// NOTE: this configuration option is only applicable for devices with a +// Virtual Secure Engine (VSE), and requires the 'Power Manager' component +// to be included in the project. +// +// Default: 0 +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) + +// Number of random words to buffer before putting the device to sleep <1-63> +// This option can be used to decrease the amount of random words that +// (if enabled) are buffered before the device enters EM2/EM3. Lowering this +// number will result in less static RAM usage, but also means that the TRNG +// potentially has to be initialized more times--leading to increased power +// consumption. By default this option in configured to buffer as much TRNG +// data as possible (limited by the depth of the TRNG FIFO). +// +// NOTE: this configuration option is only applicable when +// SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP is enabled. +// +// Default: 63 +#define SL_VSE_MAX_TRNG_WORDS_BUFFERED_DURING_SLEEP (63) +// + +// + // <<< end of configuration section >>> // ----------------------------------------------------------------------------- @@ -131,4 +167,4 @@ #include "sli_psa_builtin_config_autogen.h" -#endif // PSA_CRYPTO_CONFIG_H +#endif // PSA_CRYPTO_CONFIG_H \ No newline at end of file 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 f1804587..4b062b7c 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 +#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_custom_manufacturing_token_header.h b/src/ncp-uart-hw/config/sl_custom_manufacturing_token_header.h index 08b66580..cba1a05e 100644 --- a/src/ncp-uart-hw/config/sl_custom_manufacturing_token_header.h +++ b/src/ncp-uart-hw/config/sl_custom_manufacturing_token_header.h @@ -81,4 +81,4 @@ MFG_EXAMPLE_LOCATION, {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF}) #endif - */ + */ \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_custom_token_header.h b/src/ncp-uart-hw/config/sl_custom_token_header.h index abfe057a..2d68afff 100644 --- a/src/ncp-uart-hw/config/sl_custom_token_header.h +++ b/src/ncp-uart-hw/config/sl_custom_token_header.h @@ -83,4 +83,4 @@ * INDEXEDTOKEN3_DEFAULT) * #endif * - ******************************************************************************/ + ******************************************************************************/ \ No newline at end of file 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 fee7e65d..f22934ac 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 +#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_device_init_emu_config.h b/src/ncp-uart-hw/config/sl_device_init_emu_config.h index 4ac96bac..f23d055b 100644 --- a/src/ncp-uart-hw/config/sl_device_init_emu_config.h +++ b/src/ncp-uart-hw/config/sl_device_init_emu_config.h @@ -50,4 +50,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_EMU_CONFIG_H +#endif // SL_DEVICE_INIT_EMU_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_device_init_hfrco_config.h b/src/ncp-uart-hw/config/sl_device_init_hfrco_config.h index d2d99400..532885ae 100644 --- a/src/ncp-uart-hw/config/sl_device_init_hfrco_config.h +++ b/src/ncp-uart-hw/config/sl_device_init_hfrco_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H +#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_device_init_hfxo_config.h b/src/ncp-uart-hw/config/sl_device_init_hfxo_config.h index 6a35767e..917e60a6 100644 --- a/src/ncp-uart-hw/config/sl_device_init_hfxo_config.h +++ b/src/ncp-uart-hw/config/sl_device_init_hfxo_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFXO_CONFIG_H +#endif // SL_DEVICE_INIT_HFXO_CONFIG_H \ No newline at end of file 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 6bd763ba..29371b6c 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 @@ -63,4 +63,26 @@ #define SL_DEVICE_INIT_LFXO_TIMEOUT cmuLfxoStartupDelay_4KCycles // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H +// <<< sl:start pin_tool >>> +// SL_DEVICE_INIT_LFXO +// $[LFXO_SL_DEVICE_INIT_LFXO] +#define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO + +// LFXO LFXTAL_O on PD00 +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 + +// LFXO LFXTAL_I on PD01 +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 + + +// [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 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 d622f20a..ada07a34 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 +#endif \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_iostream_vuart_config.h b/src/ncp-uart-hw/config/sl_iostream_vuart_config.h index 82889008..b0c53246 100644 --- a/src/ncp-uart-hw/config/sl_iostream_vuart_config.h +++ b/src/ncp-uart-hw/config/sl_iostream_vuart_config.h @@ -39,4 +39,4 @@ // // <<< end of configuration section >>> -#endif +#endif \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_legacy_hal_wdog_config.h b/src/ncp-uart-hw/config/sl_legacy_hal_wdog_config.h index 86a5c629..786ef227 100644 --- a/src/ncp-uart-hw/config/sl_legacy_hal_wdog_config.h +++ b/src/ncp-uart-hw/config/sl_legacy_hal_wdog_config.h @@ -85,4 +85,4 @@ #endif /* SL_LEGACY_HAL_WDOG_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_mbedtls_config.h b/src/ncp-uart-hw/config/sl_mbedtls_config.h index 39b51496..5ebefc9a 100644 --- a/src/ncp-uart-hw/config/sl_mbedtls_config.h +++ b/src/ncp-uart-hw/config/sl_mbedtls_config.h @@ -115,4 +115,4 @@ // Included for backward compatibility reasons. #include "mbedtls/build_info.h" -#endif // SL_MBEDTLS_CONFIG_H +#endif // SL_MBEDTLS_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_mbedtls_device_config.h b/src/ncp-uart-hw/config/sl_mbedtls_device_config.h index 33c34c42..e286a0d9 100644 --- a/src/ncp-uart-hw/config/sl_mbedtls_device_config.h +++ b/src/ncp-uart-hw/config/sl_mbedtls_device_config.h @@ -69,4 +69,4 @@ #define SL_SE_ASSUME_FW_AT_LEAST_1_2_2 1 #endif -#endif // SL_MBEDTLS_DEVICE_CONFIG_H +#endif // SL_MBEDTLS_DEVICE_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_power_manager_config.h b/src/ncp-uart-hw/config/sl_power_manager_config.h index a97fb038..e4b1da09 100644 --- a/src/ncp-uart-hw/config/sl_power_manager_config.h +++ b/src/ncp-uart-hw/config/sl_power_manager_config.h @@ -61,4 +61,4 @@ #endif /* SL_POWER_MANAGER_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_rail_util_pa_config.h b/src/ncp-uart-hw/config/sl_rail_util_pa_config.h index 357f4296..84b836c2 100644 --- a/src/ncp-uart-hw/config/sl_rail_util_pa_config.h +++ b/src/ncp-uart-hw/config/sl_rail_util_pa_config.h @@ -78,4 +78,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_PA_CONFIG_H +#endif // SL_RAIL_UTIL_PA_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_rail_util_power_manager_init_config.h b/src/ncp-uart-hw/config/sl_rail_util_power_manager_init_config.h index cbc69f24..03a1dfd0 100644 --- a/src/ncp-uart-hw/config/sl_rail_util_power_manager_init_config.h +++ b/src/ncp-uart-hw/config/sl_rail_util_power_manager_init_config.h @@ -41,4 +41,4 @@ // // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_POWER_MANAGER_INIT_CONFIG_H +#endif // SL_RAIL_UTIL_POWER_MANAGER_INIT_CONFIG_H \ No newline at end of file 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 de9d71ae..60f713a3 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 +#endif // SL_RAIL_UTIL_PTI_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_rail_util_rf_path_config.h b/src/ncp-uart-hw/config/sl_rail_util_rf_path_config.h index ca5be91c..464e91c3 100644 --- a/src/ncp-uart-hw/config/sl_rail_util_rf_path_config.h +++ b/src/ncp-uart-hw/config/sl_rail_util_rf_path_config.h @@ -45,4 +45,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_RF_PATH_CONFIG_H +#endif // SL_RAIL_UTIL_RF_PATH_CONFIG_H \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_sleeptimer_config.h b/src/ncp-uart-hw/config/sl_sleeptimer_config.h index 8344ef5f..bba646d6 100644 --- a/src/ncp-uart-hw/config/sl_sleeptimer_config.h +++ b/src/ncp-uart-hw/config/sl_sleeptimer_config.h @@ -79,4 +79,4 @@ #endif /* SLEEPTIMER_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_token_manager_config.h b/src/ncp-uart-hw/config/sl_token_manager_config.h index d99e78e0..02544106 100644 --- a/src/ncp-uart-hw/config/sl_token_manager_config.h +++ b/src/ncp-uart-hw/config/sl_token_manager_config.h @@ -51,4 +51,4 @@ #endif // SL_TOKEN_MANAGER_CONFIG_H -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_zigbee_debug_print_config.h b/src/ncp-uart-hw/config/sl_zigbee_debug_print_config.h index 9c901f40..55a8e72e 100644 --- a/src/ncp-uart-hw/config/sl_zigbee_debug_print_config.h +++ b/src/ncp-uart-hw/config/sl_zigbee_debug_print_config.h @@ -71,4 +71,4 @@ // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_zigbee_green_power_config.h b/src/ncp-uart-hw/config/sl_zigbee_green_power_config.h index 3d62c926..e0310d3a 100644 --- a/src/ncp-uart-hw/config/sl_zigbee_green_power_config.h +++ b/src/ncp-uart-hw/config/sl_zigbee_green_power_config.h @@ -50,4 +50,4 @@ // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_zigbee_light_link_config.h b/src/ncp-uart-hw/config/sl_zigbee_light_link_config.h index 7be64b76..edaded9a 100644 --- a/src/ncp-uart-hw/config/sl_zigbee_light_link_config.h +++ b/src/ncp-uart-hw/config/sl_zigbee_light_link_config.h @@ -35,4 +35,4 @@ // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_zigbee_pro_stack_config.h b/src/ncp-uart-hw/config/sl_zigbee_pro_stack_config.h index af7419ab..b050b467 100644 --- a/src/ncp-uart-hw/config/sl_zigbee_pro_stack_config.h +++ b/src/ncp-uart-hw/config/sl_zigbee_pro_stack_config.h @@ -98,4 +98,4 @@ // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_zigbee_security_link_keys_config.h b/src/ncp-uart-hw/config/sl_zigbee_security_link_keys_config.h index 9a0c8488..1bd373cc 100644 --- a/src/ncp-uart-hw/config/sl_zigbee_security_link_keys_config.h +++ b/src/ncp-uart-hw/config/sl_zigbee_security_link_keys_config.h @@ -30,4 +30,4 @@ // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/sl_zigbee_source_route_config.h b/src/ncp-uart-hw/config/sl_zigbee_source_route_config.h index 41b5e4bb..43e12d63 100644 --- a/src/ncp-uart-hw/config/sl_zigbee_source_route_config.h +++ b/src/ncp-uart-hw/config/sl_zigbee_source_route_config.h @@ -30,4 +30,4 @@ // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/zigbee_sleep_config.h b/src/ncp-uart-hw/config/zigbee_sleep_config.h index fa4efd14..49fe8146 100644 --- a/src/ncp-uart-hw/config/zigbee_sleep_config.h +++ b/src/ncp-uart-hw/config/zigbee_sleep_config.h @@ -39,4 +39,4 @@ #define SL_ZIGBEE_APP_FRAMEWORK_USE_BUTTON_TO_STAY_AWAKE 0 // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/config/zigbee_watchdog_periodic_refresh_config.h b/src/ncp-uart-hw/config/zigbee_watchdog_periodic_refresh_config.h index e317fedb..35f204e7 100644 --- a/src/ncp-uart-hw/config/zigbee_watchdog_periodic_refresh_config.h +++ b/src/ncp-uart-hw/config/zigbee_watchdog_periodic_refresh_config.h @@ -31,4 +31,4 @@ // // -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/ncp-uart-hw/ncp-uart-hw.pintool b/src/ncp-uart-hw/ncp-uart-hw.pintool index d01f3a62..4730c361 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 b213d594..72d95dac 100644 --- a/src/ncp-uart-hw/ncp-uart-hw.slcp +++ b/src/ncp-uart-hw/ncp-uart-hw.slcp @@ -26,29 +26,29 @@ source: - {path: main.c} - {path: app.c} tag: [prebuilt_demo] -sdk: {id: gecko_sdk, version: 4.4.0} +sdk: {id: gecko_sdk, version: 4.4.2} toolchain_settings: [] component: -- {id: zigbee_security_link_keys} -- {id: zigbee_gp} -- {id: zigbee_debug_basic} -- {id: zigbee_app_framework_common} +- {id: EFR32MG21A010F1024IM32} - {id: brd4001a} +- {id: brd4179b} - instance: [vcom] id: iostream_usart -- {id: zigbee_source_route} -- {id: zigbee_zll} +- {id: iostream_vuart} +- {id: token_manager} +- {id: zigbee_app_framework_common} +- {id: zigbee_debug_basic} +- {id: zigbee_debug_extended} +- {id: zigbee_debug_print} +- {id: zigbee_gp} +- {id: zigbee_mfglib} - {id: zigbee_ncp_uart_hardware} - {id: zigbee_pro_stack} -- {id: zigbee_mfglib} -- {id: token_manager} -- {id: brd4179b} - {id: zigbee_r22_support} -- {id: zigbee_debug_print} +- {id: zigbee_security_link_keys} +- {id: zigbee_source_route} - {id: zigbee_token_interface} -- {id: zigbee_debug_extended} -- {id: EFR32MG21A010F1024IM32} -- {id: iostream_vuart} +- {id: zigbee_zll} define: - {name: EMBER_CUSTOM_MAC_FILTER_TABLE_SIZE, value: '15'} configuration: diff --git a/src/ncp-uart-hw/ncp-uart-hw.slps b/src/ncp-uart-hw/ncp-uart-hw.slps index c55f6b99..113b53a9 100644 --- a/src/ncp-uart-hw/ncp-uart-hw.slps +++ b/src/ncp-uart-hw/ncp-uart-hw.slps @@ -1,7 +1,7 @@ - + diff --git a/src/rcp-uart-802154/.cproject b/src/rcp-uart-802154/.cproject index 4496d92d..cecebab1 100644 --- a/src/rcp-uart-802154/.cproject +++ b/src/rcp-uart-802154/.cproject @@ -23,7 +23,7 @@ - + @@ -499,7 +499,7 @@ - + From 423c7337b44442e16bfc1992da0d5eef9a27347b Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:37:09 -0400 Subject: [PATCH 4/9] Bump firmware eraser to 4.4.2 --- misc/firmware-eraser/.cproject | 12 +++++----- .../config/app_properties_config.h | 4 ++-- .../config/btl_interface_cfg.h | 2 +- .../config/btl_interface_cfg_s2c1.h | 2 +- .../config/emlib_core_debug_config.h | 2 +- .../config/sl_board_control_config.h | 2 +- .../config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_emu_config.h | 2 +- .../config/sl_device_init_hfrco_config.h | 2 +- .../config/sl_device_init_hfxo_config.h | 2 +- .../config/sl_device_init_lfxo_config.h | 24 ++++++++++++++++++- misc/firmware-eraser/firmware-eraser.pintool | 2 +- misc/firmware-eraser/firmware-eraser.slcp | 12 +++++----- misc/firmware-eraser/firmware-eraser.slps | 2 +- 14 files changed, 47 insertions(+), 25 deletions(-) diff --git a/misc/firmware-eraser/.cproject b/misc/firmware-eraser/.cproject index a4c2a4c7..38bd6a04 100644 --- a/misc/firmware-eraser/.cproject +++ b/misc/firmware-eraser/.cproject @@ -4,7 +4,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -245,7 +245,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -323,14 +323,14 @@ - + - + diff --git a/misc/firmware-eraser/config/app_properties_config.h b/misc/firmware-eraser/config/app_properties_config.h index a19960d9..6951a569 100644 --- a/misc/firmware-eraser/config/app_properties_config.h +++ b/misc/firmware-eraser/config/app_properties_config.h @@ -58,8 +58,8 @@ #define SL_APPLICATION_CAPABILITIES 0 //Product ID of the device for which the application is built -#define SL_APPLICATION_PRODUCT_ID { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } +#define SL_APPLICATION_PRODUCT_ID { 0 } // -#endif // APP_PROPERTIES_CONFIG_H +#endif // APP_PROPERTIES_CONFIG_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/btl_interface_cfg.h b/misc/firmware-eraser/config/btl_interface_cfg.h index 8e246f80..13e09116 100644 --- a/misc/firmware-eraser/config/btl_interface_cfg.h +++ b/misc/firmware-eraser/config/btl_interface_cfg.h @@ -45,4 +45,4 @@ #endif // !BOOTLOADER_APPLOADER -#endif // BTL_INTERFACE_CFG_H +#endif // BTL_INTERFACE_CFG_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/btl_interface_cfg_s2c1.h b/misc/firmware-eraser/config/btl_interface_cfg_s2c1.h index c72c27b0..7f703143 100644 --- a/misc/firmware-eraser/config/btl_interface_cfg_s2c1.h +++ b/misc/firmware-eraser/config/btl_interface_cfg_s2c1.h @@ -278,4 +278,4 @@ | (BOOTLOADER_PPUSATD1_SEMAILBOX << _SMU_PPUSATD1_SEMAILBOX_SHIFT)) #endif // BOOTLOADER_MANUAL_OVERRIDE_SECURITY_STATE -#endif // BTL_INTERFACE_CFG_S2C1_H +#endif // BTL_INTERFACE_CFG_S2C1_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/emlib_core_debug_config.h b/misc/firmware-eraser/config/emlib_core_debug_config.h index 07ee9b9e..e4a01682 100644 --- a/misc/firmware-eraser/config/emlib_core_debug_config.h +++ b/misc/firmware-eraser/config/emlib_core_debug_config.h @@ -42,4 +42,4 @@ // // <<< end of configuration section >>> -#endif // EM_CORE_CONFIG_H +#endif // EM_CORE_CONFIG_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/sl_board_control_config.h b/misc/firmware-eraser/config/sl_board_control_config.h index b5a16b94..f661afa0 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 +#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/sl_debug_swo_config.h b/misc/firmware-eraser/config/sl_debug_swo_config.h index fee7e65d..f22934ac 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 +#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/sl_device_init_emu_config.h b/misc/firmware-eraser/config/sl_device_init_emu_config.h index 4ac96bac..f23d055b 100644 --- a/misc/firmware-eraser/config/sl_device_init_emu_config.h +++ b/misc/firmware-eraser/config/sl_device_init_emu_config.h @@ -50,4 +50,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_EMU_CONFIG_H +#endif // SL_DEVICE_INIT_EMU_CONFIG_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/sl_device_init_hfrco_config.h b/misc/firmware-eraser/config/sl_device_init_hfrco_config.h index d2d99400..532885ae 100644 --- a/misc/firmware-eraser/config/sl_device_init_hfrco_config.h +++ b/misc/firmware-eraser/config/sl_device_init_hfrco_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H +#endif // SL_DEVICE_INIT_HFRCO_CONFIG_H \ No newline at end of file diff --git a/misc/firmware-eraser/config/sl_device_init_hfxo_config.h b/misc/firmware-eraser/config/sl_device_init_hfxo_config.h index 6a35767e..917e60a6 100644 --- a/misc/firmware-eraser/config/sl_device_init_hfxo_config.h +++ b/misc/firmware-eraser/config/sl_device_init_hfxo_config.h @@ -54,4 +54,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFXO_CONFIG_H +#endif // SL_DEVICE_INIT_HFXO_CONFIG_H \ No newline at end of file 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 6bd763ba..29371b6c 100644 --- a/misc/firmware-eraser/config/sl_device_init_lfxo_config.h +++ b/misc/firmware-eraser/config/sl_device_init_lfxo_config.h @@ -63,4 +63,26 @@ #define SL_DEVICE_INIT_LFXO_TIMEOUT cmuLfxoStartupDelay_4KCycles // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_LFXO_CONFIG_H +// <<< sl:start pin_tool >>> +// SL_DEVICE_INIT_LFXO +// $[LFXO_SL_DEVICE_INIT_LFXO] +#define SL_DEVICE_INIT_LFXO_PERIPHERAL LFXO + +// LFXO LFXTAL_O on PD00 +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_O_PIN 0 + +// LFXO LFXTAL_I on PD01 +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PORT gpioPortD +#define SL_DEVICE_INIT_LFXO_LFXTAL_I_PIN 1 + + +// [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 diff --git a/misc/firmware-eraser/firmware-eraser.pintool b/misc/firmware-eraser/firmware-eraser.pintool index d01f3a62..4730c361 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 87b35fed..58036c1b 100644 --- a/misc/firmware-eraser/firmware-eraser.slcp +++ b/misc/firmware-eraser/firmware-eraser.slcp @@ -22,17 +22,17 @@ include: - path: '' file_list: - {path: app.h} -sdk: {id: gecko_sdk, version: 4.4.0} +sdk: {id: gecko_sdk, version: 4.4.2} toolchain_settings: [] component: -- {id: sl_system} -- {id: brd4001a} +- {id: EFR32MG21A010F1024IM32} - {id: bootloader_app_properties} +- {id: bootloader_interface} +- {id: brd4001a} +- {id: brd4179b} - {id: cpp_support} - {id: device_init} -- {id: brd4179b} -- {id: bootloader_interface} -- {id: EFR32MG21A010F1024IM32} +- {id: sl_system} define: - {name: DEBUG_EFM} ui_hints: diff --git a/misc/firmware-eraser/firmware-eraser.slps b/misc/firmware-eraser/firmware-eraser.slps index d60e42ca..b0409ce9 100644 --- a/misc/firmware-eraser/firmware-eraser.slps +++ b/misc/firmware-eraser/firmware-eraser.slps @@ -1,7 +1,7 @@ - + From 695adff34051ca07183713446305f8a3437a8650 Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:38:52 -0400 Subject: [PATCH 5/9] Bump bootloader to 4.4.2 --- src/bootloader-uart-xmodem/.cproject | 6 +-- .../bootloader-uart-xmodem.pintool | 2 +- .../bootloader-uart-xmodem.slcp | 20 +++++----- .../bootloader-uart-xmodem.slps | 2 +- .../config/btl_aes_ctr_stream_block_cfg.h | 2 +- .../config/btl_core_cfg.h | 4 +- .../config/btl_debug_cfg.h | 2 +- .../config/btl_gpio_activation_cfg.h | 2 +- .../config/btl_uart_driver_cfg.h | 2 +- .../config/btl_xmodem_config.h | 2 +- .../config/emlib_core_debug_config.h | 2 +- .../config/psa_crypto_config.h | 38 ++++++++++++++++++- .../config/sl_fault_injection_hardening_cfg.h | 2 +- .../config/sl_mbedtls_config.h | 2 +- .../config/sl_mbedtls_device_config.h | 2 +- 15 files changed, 63 insertions(+), 27 deletions(-) diff --git a/src/bootloader-uart-xmodem/.cproject b/src/bootloader-uart-xmodem/.cproject index b960729a..285017d5 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 f6080cec..4963aa39 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 68f54b00..5c191301 100644 --- a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp +++ b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slcp @@ -15,23 +15,23 @@ package: bootloader quality: production readme: - {path: readme.md} -sdk: {id: gecko_sdk, version: 4.4.0} +sdk: {id: gecko_sdk, version: 4.4.2} toolchain_settings: [] component: -- {id: bootloader_token_management} -- {id: bootloader_serial_driver} -- {id: bootloader_crc} +- {id: EFR32MG21A010F1024IM32} - {id: bootloader_aes_sha_ecdsa} +- {id: bootloader_core} +- {id: bootloader_crc} +- {id: bootloader_debug} +- {id: bootloader_delay_driver} - {id: bootloader_gpio_activation} +- {id: bootloader_image_parser} +- {id: bootloader_serial_driver} +- {id: bootloader_token_management} - {id: bootloader_uart_xmodem} -- {id: brd4001a} - {id: bootloader_xmodem_parser} -- {id: bootloader_delay_driver} -- {id: bootloader_debug} +- {id: brd4001a} - {id: brd4179b} -- {id: bootloader_image_parser} -- {id: bootloader_core} -- {id: EFR32MG21A010F1024IM32} configuration: - {name: SL_VCOM_ENABLE, value: '1'} ui_hints: diff --git a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps index 60e0819c..2cbc35df 100644 --- a/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps +++ b/src/bootloader-uart-xmodem/bootloader-uart-xmodem.slps @@ -1,7 +1,7 @@ - + diff --git a/src/bootloader-uart-xmodem/config/btl_aes_ctr_stream_block_cfg.h b/src/bootloader-uart-xmodem/config/btl_aes_ctr_stream_block_cfg.h index 9be7befa..3c393100 100644 --- a/src/bootloader-uart-xmodem/config/btl_aes_ctr_stream_block_cfg.h +++ b/src/bootloader-uart-xmodem/config/btl_aes_ctr_stream_block_cfg.h @@ -41,4 +41,4 @@ #define SLI_SE_AES_CTR_NUM_BLOCKS_BUFFERED BOOTLOADER_AES_CTR_NUM_BLOCKS_BUFFERED #endif -#endif //BTL_AES_CTR_STREAM_BLOCK_CFG_H +#endif //BTL_AES_CTR_STREAM_BLOCK_CFG_H \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/btl_core_cfg.h b/src/bootloader-uart-xmodem/config/btl_core_cfg.h index c60b190a..c626d884 100644 --- a/src/bootloader-uart-xmodem/config/btl_core_cfg.h +++ b/src/bootloader-uart-xmodem/config/btl_core_cfg.h @@ -114,7 +114,7 @@ // Bootloader Version Main Customer // Default: 0 // Bootloader Version Main Customer -#define BOOTLOADER_VERSION_MAIN_CUSTOMER 0 +#define BOOTLOADER_VERSION_MAIN_CUSTOMER 2 // Use custom Bootloader Application Size // Default: 0 @@ -136,4 +136,4 @@ // <<< end of configuration section >>> -#endif // BTL_CORE_CONFIG_H +#endif // BTL_CORE_CONFIG_H \ 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 a80201d5..300821a2 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 +#endif // BTL_DEBUG_CONFIG_H \ No newline at end of file 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 b85697a1..7df641be 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 +#endif // BTL_GPIO_ACTIVATION_CONFIG_H \ No newline at end of file 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 7f5ab91f..46220e0d 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 +#endif // BTL_UART_DRIVER_CONFIG_H \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/btl_xmodem_config.h b/src/bootloader-uart-xmodem/config/btl_xmodem_config.h index 847cf2f8..6306f3e6 100644 --- a/src/bootloader-uart-xmodem/config/btl_xmodem_config.h +++ b/src/bootloader-uart-xmodem/config/btl_xmodem_config.h @@ -45,4 +45,4 @@ #endif // End of BTL_XMODEM_CONFIG_H module include. -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/emlib_core_debug_config.h b/src/bootloader-uart-xmodem/config/emlib_core_debug_config.h index 07ee9b9e..e4a01682 100644 --- a/src/bootloader-uart-xmodem/config/emlib_core_debug_config.h +++ b/src/bootloader-uart-xmodem/config/emlib_core_debug_config.h @@ -42,4 +42,4 @@ // // <<< end of configuration section >>> -#endif // EM_CORE_CONFIG_H +#endif // EM_CORE_CONFIG_H \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/psa_crypto_config.h b/src/bootloader-uart-xmodem/config/psa_crypto_config.h index 7d9144b3..a17b0efc 100644 --- a/src/bootloader-uart-xmodem/config/psa_crypto_config.h +++ b/src/bootloader-uart-xmodem/config/psa_crypto_config.h @@ -110,6 +110,42 @@ // +// Power optimization configuration + +// Store already-generated random bytes before putting the device to sleep +// Using the hardware TRNG (for example through psa_generate_random()) will +// consume a non-negligible amount of power. A start-up routine must pass +// and a relatively large minimum amount of random bytes will be generated. +// Use cases where the device is frequently entering EM2/EM3 and thereafter +// consumes a small amount of data from the TRNG may benefit from buffering +// the existing random bytes before putting the device to sleep. These +// buffered bytes are then consumed until exhaustion before the TRNG needs +// to be initialized and used again. +// +// NOTE: this configuration option is only applicable for devices with a +// Virtual Secure Engine (VSE), and requires the 'Power Manager' component +// to be included in the project. +// +// Default: 0 +#define SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP (0) + +// Number of random words to buffer before putting the device to sleep <1-63> +// This option can be used to decrease the amount of random words that +// (if enabled) are buffered before the device enters EM2/EM3. Lowering this +// number will result in less static RAM usage, but also means that the TRNG +// potentially has to be initialized more times--leading to increased power +// consumption. By default this option in configured to buffer as much TRNG +// data as possible (limited by the depth of the TRNG FIFO). +// +// NOTE: this configuration option is only applicable when +// SL_VSE_BUFFER_TRNG_DATA_DURING_SLEEP is enabled. +// +// Default: 63 +#define SL_VSE_MAX_TRNG_WORDS_BUFFERED_DURING_SLEEP (63) +// + +// + // <<< end of configuration section >>> // ----------------------------------------------------------------------------- @@ -131,4 +167,4 @@ #include "sli_psa_builtin_config_autogen.h" -#endif // PSA_CRYPTO_CONFIG_H +#endif // PSA_CRYPTO_CONFIG_H \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/sl_fault_injection_hardening_cfg.h b/src/bootloader-uart-xmodem/config/sl_fault_injection_hardening_cfg.h index 313bb512..3cde4e05 100644 --- a/src/bootloader-uart-xmodem/config/sl_fault_injection_hardening_cfg.h +++ b/src/bootloader-uart-xmodem/config/sl_fault_injection_hardening_cfg.h @@ -104,4 +104,4 @@ #error "Choose either TFM fault injection hardening profile as LOW or Medium or High" #endif // !TFM_FIH_PROFILE_LOW && TFM_FIH_PROFILE_MEDIUM && TFM_FIH_PROFILE_HIGH #endif // TFM_FIH_PROFILE_ON -#endif // FAULT_INJECTION_HARDENING_CFG_H +#endif // FAULT_INJECTION_HARDENING_CFG_H \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/sl_mbedtls_config.h b/src/bootloader-uart-xmodem/config/sl_mbedtls_config.h index 39b51496..5ebefc9a 100644 --- a/src/bootloader-uart-xmodem/config/sl_mbedtls_config.h +++ b/src/bootloader-uart-xmodem/config/sl_mbedtls_config.h @@ -115,4 +115,4 @@ // Included for backward compatibility reasons. #include "mbedtls/build_info.h" -#endif // SL_MBEDTLS_CONFIG_H +#endif // SL_MBEDTLS_CONFIG_H \ No newline at end of file diff --git a/src/bootloader-uart-xmodem/config/sl_mbedtls_device_config.h b/src/bootloader-uart-xmodem/config/sl_mbedtls_device_config.h index 33c34c42..e286a0d9 100644 --- a/src/bootloader-uart-xmodem/config/sl_mbedtls_device_config.h +++ b/src/bootloader-uart-xmodem/config/sl_mbedtls_device_config.h @@ -69,4 +69,4 @@ #define SL_SE_ASSUME_FW_AT_LEAST_1_2_2 1 #endif -#endif // SL_MBEDTLS_DEVICE_CONFIG_H +#endif // SL_MBEDTLS_DEVICE_CONFIG_H \ No newline at end of file From caab2531fcdc877837f8dccb25dc0450d233a0af Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:41:41 -0400 Subject: [PATCH 6/9] Bump Z-Wave NCP to 4.4.2 --- src/zwave_ncp_serial_api_controller/.cproject | 18 +++++------ .../config/FreeRTOSConfig.h | 2 +- .../config/app_properties_config.h | 2 +- .../config/btl_interface_cfg.h | 2 +- .../config/emlib_core_debug_config.h | 2 +- .../config/extension_board_8029a_efr32xg13.h | 2 +- .../extension_board_8029a_efr32xg13_button.h | 7 +++- .../extension_board_8029a_efr32xg13_led.h | 5 ++- .../extension_board_8029a_efr32xg13_slider.h | 4 ++- .../config/nvm3_default_config.h | 2 +- .../config/serial_api_config.h | 2 +- .../config/sl_board_control_config.h | 2 +- .../config/sl_debug_swo_config.h | 2 +- .../config/sl_device_init_dcdc_config.h | 2 +- .../config/sl_device_init_emu_config.h | 2 +- .../config/sl_device_init_hfxo_config.h | 2 +- .../config/sl_fem_util_config.h | 2 +- .../config/sl_power_manager_config.h | 2 +- .../config/sl_rail_util_pa_config.h | 2 +- .../sl_rail_util_power_manager_init_config.h | 2 +- .../config/sl_rail_util_sequencer_config.h | 2 +- .../config/sl_sleeptimer_config.h | 2 +- .../config/zaf_appname_config.h | 2 +- .../config/zaf_config.h | 2 +- .../zaf_event_distributor_core_config.h | 2 +- .../config/zpal_zwave_nvm_instance_config.h | 7 ++-- .../config/zw_build_no.h | 2 +- .../config/zw_config_rf.h | 2 +- .../config/zw_region_config.h | 2 +- .../config/zw_version_config.h | 2 +- .../zwave_ncp_serial_api_controller.pintool | 2 +- .../zwave_ncp_serial_api_controller.slcp | 32 +++++++++---------- .../zwave_ncp_serial_api_controller.slps | 2 +- 33 files changed, 69 insertions(+), 58 deletions(-) diff --git a/src/zwave_ncp_serial_api_controller/.cproject b/src/zwave_ncp_serial_api_controller/.cproject index 57aedd30..eaaee6a7 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/FreeRTOSConfig.h b/src/zwave_ncp_serial_api_controller/config/FreeRTOSConfig.h index 25512304..66a1bb3a 100644 --- a/src/zwave_ncp_serial_api_controller/config/FreeRTOSConfig.h +++ b/src/zwave_ncp_serial_api_controller/config/FreeRTOSConfig.h @@ -268,4 +268,4 @@ //#if defined(SL_CATALOG_SYSTEMVIEW_TRACE_PRESENT) //#include "SEGGER_SYSVIEW_FreeRTOS.h" //#endif -#endif /* FREERTOS_CONFIG_H */ +#endif /* FREERTOS_CONFIG_H */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/app_properties_config.h b/src/zwave_ncp_serial_api_controller/config/app_properties_config.h index 6a6b9766..6951a569 100644 --- a/src/zwave_ncp_serial_api_controller/config/app_properties_config.h +++ b/src/zwave_ncp_serial_api_controller/config/app_properties_config.h @@ -62,4 +62,4 @@ // -#endif // APP_PROPERTIES_CONFIG_H +#endif // APP_PROPERTIES_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/btl_interface_cfg.h b/src/zwave_ncp_serial_api_controller/config/btl_interface_cfg.h index 8e246f80..13e09116 100644 --- a/src/zwave_ncp_serial_api_controller/config/btl_interface_cfg.h +++ b/src/zwave_ncp_serial_api_controller/config/btl_interface_cfg.h @@ -45,4 +45,4 @@ #endif // !BOOTLOADER_APPLOADER -#endif // BTL_INTERFACE_CFG_H +#endif // BTL_INTERFACE_CFG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/emlib_core_debug_config.h b/src/zwave_ncp_serial_api_controller/config/emlib_core_debug_config.h index 07ee9b9e..e4a01682 100644 --- a/src/zwave_ncp_serial_api_controller/config/emlib_core_debug_config.h +++ b/src/zwave_ncp_serial_api_controller/config/emlib_core_debug_config.h @@ -42,4 +42,4 @@ // // <<< end of configuration section >>> -#endif // EM_CORE_CONFIG_H +#endif // EM_CORE_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13.h b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13.h index d2796745..f83a5e81 100644 --- a/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13.h +++ b/src/zwave_ncp_serial_api_controller/config/extension_board_8029a_efr32xg13.h @@ -45,4 +45,4 @@ #define APP_WAKEUP_BTN_SLDR BOARD_BUTTON_PB3 // Use this one when wakeup capability is required and button is preferred to slider #define APP_WAKEUP_SLDR_BTN BOARD_BUTTON_PB3 // Use this one when wakeup capability is required and slider is preferred to button -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_H */ +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_H */ \ No newline at end of file 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 8e4dcc1b..0cc9a7a2 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,7 +17,9 @@ */ // <<< Use Configuration Wizard in Context Menu >>> + // Button Configuration + #define PB1_LABEL "BTN0" // Button1 ON value @@ -34,6 +36,7 @@ // 0 #define PB1_CAN_WAKEUP_EM4 0 + #define PB2_LABEL "BTN1" // Button2 ON value @@ -50,6 +53,7 @@ // 1 #define PB2_CAN_WAKEUP_EM4 1 + #define PB3_LABEL "BTN2" // Button3 ON value @@ -66,6 +70,7 @@ // 1 #define PB3_CAN_WAKEUP_EM4 1 + #define PB4_LABEL "BTN3" // Button4 ON value @@ -130,4 +135,4 @@ // <<< sl:end pin_tool >>> -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_BUTTON_H */ +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_BUTTON_H */ \ No newline at end of file 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 e6717eac..a440c525 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,7 +17,9 @@ */ // <<< Use Configuration Wizard in Context Menu >>> + // LED Configuration + // LED1 ON value // <0=> Active low // <1=> Active high @@ -96,6 +98,7 @@ // <<< sl:end pin_tool >>> + /*************************************************************************/ /* Configure RGB LEDs */ /*************************************************************************/ @@ -104,4 +107,4 @@ * If paired with radio board ZGM13 then the RGB on that board can be used */ -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_LED_H */ +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_LED_H */ \ No newline at end of file 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 7b13ffee..68cc8856 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,7 +12,9 @@ /*************************************************************************/ // <<< Use Configuration Wizard in Context Menu >>> + // Slider Configuration + #define SLIDER1_LABEL "SW1" // Slider ON value @@ -47,4 +49,4 @@ // <<< sl:end pin_tool >>> -#endif /* EXTENSION_BOARD_8029A_EFR32XG13_SLIDER_H */ +#endif /* EXTENSION_BOARD_8029A_EFR32XG13_SLIDER_H */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/nvm3_default_config.h b/src/zwave_ncp_serial_api_controller/config/nvm3_default_config.h index 0f63c6ea..71bb6563 100644 --- a/src/zwave_ncp_serial_api_controller/config/nvm3_default_config.h +++ b/src/zwave_ncp_serial_api_controller/config/nvm3_default_config.h @@ -42,4 +42,4 @@ // <<< end of configuration section >>> -#endif // NVM3_DEFAULT_CONFIG_H +#endif // NVM3_DEFAULT_CONFIG_H \ No newline at end of file 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 0d025455..ad4a51a3 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 +#endif // SERIAL_API_CONFIG_H \ No newline at end of file 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 3faa30a6..ad15ebb1 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 +#endif // SL_BOARD_CONTROL_CONFIG_H \ No newline at end of file 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 75896a71..5ed74316 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 +#endif // SL_DEBUG_SWO_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_device_init_dcdc_config.h b/src/zwave_ncp_serial_api_controller/config/sl_device_init_dcdc_config.h index 6294af87..e3deec07 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_device_init_dcdc_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_device_init_dcdc_config.h @@ -55,4 +55,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_DCDC_CONFIG_H +#endif // SL_DEVICE_INIT_DCDC_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_device_init_emu_config.h b/src/zwave_ncp_serial_api_controller/config/sl_device_init_emu_config.h index c3ff963e..68a04c23 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_device_init_emu_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_device_init_emu_config.h @@ -65,4 +65,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_EMU_CONFIG_H +#endif // SL_DEVICE_INIT_EMU_CONFIG_H \ No newline at end of file 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 12150df1..102818c0 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 @@ -69,4 +69,4 @@ // <<< end of configuration section >>> -#endif // SL_DEVICE_INIT_HFXO_CONFIG_H +#endif // SL_DEVICE_INIT_HFXO_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_fem_util_config.h b/src/zwave_ncp_serial_api_controller/config/sl_fem_util_config.h index 7cf4f4fb..f7d358dd 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_fem_util_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_fem_util_config.h @@ -92,4 +92,4 @@ #define SL_FEM_UTIL_OPTIMIZED_PHY_ENABLE 0 #define SL_FEM_UTIL_RUNTIME_PHY_SELECT 0 -#endif // SL_FEM_UTIL_CONFIG_H +#endif // SL_FEM_UTIL_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_power_manager_config.h b/src/zwave_ncp_serial_api_controller/config/sl_power_manager_config.h index a97fb038..e4b1da09 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_power_manager_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_power_manager_config.h @@ -61,4 +61,4 @@ #endif /* SL_POWER_MANAGER_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_rail_util_pa_config.h b/src/zwave_ncp_serial_api_controller/config/sl_rail_util_pa_config.h index 34adb6e5..0c983c34 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_rail_util_pa_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_rail_util_pa_config.h @@ -77,4 +77,4 @@ // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_PA_CONFIG_H +#endif // SL_RAIL_UTIL_PA_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_rail_util_power_manager_init_config.h b/src/zwave_ncp_serial_api_controller/config/sl_rail_util_power_manager_init_config.h index 08dc1fe8..a9df48b4 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_rail_util_power_manager_init_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_rail_util_power_manager_init_config.h @@ -41,4 +41,4 @@ // // <<< end of configuration section >>> -#endif // SL_RAIL_UTIL_POWER_MANAGER_INIT_CONFIG_H +#endif // SL_RAIL_UTIL_POWER_MANAGER_INIT_CONFIG_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_rail_util_sequencer_config.h b/src/zwave_ncp_serial_api_controller/config/sl_rail_util_sequencer_config.h index 3701c8af..9a584a07 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_rail_util_sequencer_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_rail_util_sequencer_config.h @@ -45,4 +45,4 @@ extern "C" { } #endif -#endif // SL_RAIL_UTIL_SEQUENCER_H +#endif // SL_RAIL_UTIL_SEQUENCER_H \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/sl_sleeptimer_config.h b/src/zwave_ncp_serial_api_controller/config/sl_sleeptimer_config.h index 8344ef5f..bba646d6 100644 --- a/src/zwave_ncp_serial_api_controller/config/sl_sleeptimer_config.h +++ b/src/zwave_ncp_serial_api_controller/config/sl_sleeptimer_config.h @@ -79,4 +79,4 @@ #endif /* SLEEPTIMER_CONFIG_H */ -// <<< end of configuration section >>> +// <<< end of configuration section >>> \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zaf_appname_config.h b/src/zwave_ncp_serial_api_controller/config/zaf_appname_config.h index 5c72c673..c52bf4a4 100644 --- a/src/zwave_ncp_serial_api_controller/config/zaf_appname_config.h +++ b/src/zwave_ncp_serial_api_controller/config/zaf_appname_config.h @@ -27,4 +27,4 @@ // <<< end of configuration section >>> -#endif /* _ZAF_APPNAME_CONFIG_H_ */ +#endif /* _ZAF_APPNAME_CONFIG_H_ */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zaf_config.h b/src/zwave_ncp_serial_api_controller/config/zaf_config.h index cb666a0d..a51b4bf3 100644 --- a/src/zwave_ncp_serial_api_controller/config/zaf_config.h +++ b/src/zwave_ncp_serial_api_controller/config/zaf_config.h @@ -397,4 +397,4 @@ // <<< end of configuration section >>> -#endif /* _ZAF_CONFIG_H_ */ +#endif /* _ZAF_CONFIG_H_ */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zaf_event_distributor_core_config.h b/src/zwave_ncp_serial_api_controller/config/zaf_event_distributor_core_config.h index 1f217b82..b5cd3958 100644 --- a/src/zwave_ncp_serial_api_controller/config/zaf_event_distributor_core_config.h +++ b/src/zwave_ncp_serial_api_controller/config/zaf_event_distributor_core_config.h @@ -27,4 +27,4 @@ // <<< end of configuration section >>> -#endif /* _ZAF_EVENT_DISTRIBUTOR_CORE_CONFIG_H_ */ +#endif /* _ZAF_EVENT_DISTRIBUTOR_CORE_CONFIG_H_ */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zpal_zwave_nvm_instance_config.h b/src/zwave_ncp_serial_api_controller/config/zpal_zwave_nvm_instance_config.h index 4fa19a15..d6ffa898 100644 --- a/src/zwave_ncp_serial_api_controller/config/zpal_zwave_nvm_instance_config.h +++ b/src/zwave_ncp_serial_api_controller/config/zpal_zwave_nvm_instance_config.h @@ -38,8 +38,9 @@ // - CC_NOTIFICATION_MAX_NOTIFICATIONS // - 3 * CC_ASSOCIATION_MAX_NODES_IN_GROUP * (1+ZAF_CONFIG_NUMBER_OF_END_POINTS) + CC_ASSOCIATION_MAX_GROUPS_PER_ENDPOINT // - 204 (minimum required by nvm3 library) -// Default: 204 -#define ZPAL_ZW_NVM_MAX_OBJECT_SIZE 204 +// - 512 (minimum required for controller) +// Default: 512 +#define ZPAL_ZW_NVM_MAX_OBJECT_SIZE 512 #endif #ifndef ZPAL_ZW_NVM_INSTANCE_REPACK_HEADROOM @@ -54,4 +55,4 @@ // <<< end of configuration section >>> -#endif /* _ZPAL_ZWAVE_NVM_INSTANCE_CONFIG_H_ */ +#endif /* _ZPAL_ZWAVE_NVM_INSTANCE_CONFIG_H_ */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zw_build_no.h b/src/zwave_ncp_serial_api_controller/config/zw_build_no.h index 7fd9752e..09377ef4 100644 --- a/src/zwave_ncp_serial_api_controller/config/zw_build_no.h +++ b/src/zwave_ncp_serial_api_controller/config/zw_build_no.h @@ -14,4 +14,4 @@ #define ZAF_BUILD_NO ZW_GetProtocolBuildNumber() #endif -#endif /* _ZW_BUILD_NO_H_ */ +#endif /* _ZW_BUILD_NO_H_ */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zw_config_rf.h b/src/zwave_ncp_serial_api_controller/config/zw_config_rf.h index 67df8127..920d318e 100644 --- a/src/zwave_ncp_serial_api_controller/config/zw_config_rf.h +++ b/src/zwave_ncp_serial_api_controller/config/zw_config_rf.h @@ -43,4 +43,4 @@ // <<< end of configuration section >>> -#endif /* _ZW_CONFIG_RF_H_ */ +#endif /* _ZW_CONFIG_RF_H_ */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zw_region_config.h b/src/zwave_ncp_serial_api_controller/config/zw_region_config.h index a8ee344d..60dc9f9a 100644 --- a/src/zwave_ncp_serial_api_controller/config/zw_region_config.h +++ b/src/zwave_ncp_serial_api_controller/config/zw_region_config.h @@ -40,4 +40,4 @@ // <<< end of configuration section >>> -#endif /* _ZW_REGION_CONFIG_H_ */ +#endif /* _ZW_REGION_CONFIG_H_ */ \ No newline at end of file diff --git a/src/zwave_ncp_serial_api_controller/config/zw_version_config.h b/src/zwave_ncp_serial_api_controller/config/zw_version_config.h index 819bd2fd..ba8b15af 100644 --- a/src/zwave_ncp_serial_api_controller/config/zw_version_config.h +++ b/src/zwave_ncp_serial_api_controller/config/zw_version_config.h @@ -57,4 +57,4 @@ #define APP_PATCH SDK_VERSION_PATCH #endif #endif -#endif /* _ZW_VERSION_CONFIG_H_ */ +#endif /* _ZW_VERSION_CONFIG_H_ */ \ No newline at end of file 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 6b657b04..f9e7fb9d 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 0cce363f..23567535 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 @@ -50,29 +50,29 @@ include: - {path: utils.h} - {path: virtual_slave_node_info.h} - {path: zaf_config_security.h} -sdk: {id: gecko_sdk, version: 4.4.0} +sdk: {id: gecko_sdk, version: 4.4.2} toolchain_settings: [] component: -- {id: zw_api_serialapi} -- {id: zaf_ncp} -- {id: mpu} +- {id: ZGM130S037HGN} +- {id: ZW_MIGRATION_FROM_7_20} - {id: brd4207a} -- {id: zw_app_timer_deep_sleep} -- {id: zw_dcdc_override} -- {id: zw_role_type_central_static_controller} -- {id: zw_core} - {id: device_init} -- {id: zw_api_zw} -- {id: zw_apputilities_minimal} +- {id: emlib_letimer} +- {id: emlib_msc} +- {id: emlib_timer} - {id: gpiointerrupt} +- {id: mpu} +- {id: sl_system} +- {id: zaf_ncp} - {id: zw_api_controller} +- {id: zw_api_serialapi} +- {id: zw_api_zw} +- {id: zw_app_timer_deep_sleep} - {id: zw_appshw_serialapi} -- {id: ZW_MIGRATION_FROM_7_20} -- {id: sl_system} -- {id: ZGM130S037HGN} -- {id: emlib_msc} -- {id: emlib_letimer} -- {id: emlib_timer} +- {id: zw_apputilities_minimal} +- {id: zw_core} +- {id: zw_dcdc_override} +- {id: zw_role_type_central_static_controller} other_file: - {path: postbuild.sh} define: 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 0f9b201b..74bbc115 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 @@ - + From ece0829fa11fdcdad5879f8de3e95c9e8ddc2465 Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:42:27 -0400 Subject: [PATCH 7/9] Ignore migration `.bak` files --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index abf395f3..7a24addf 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,6 @@ autogen/ build/ artifact/ artifacts/ -trashed_modified_files/ \ No newline at end of file +trashed_modified_files/ +src/**/*.bak +misc/**/*.bak \ No newline at end of file From 6ffd0a182c723ce24766796e50827b5df759be75 Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Thu, 2 May 2024 19:54:10 -0400 Subject: [PATCH 8/9] Bump Gecko SDK in `Dockerfile` --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index f26e0a84..9ac41213 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.0 +# Gecko SDK 4.4.2 RUN \ - curl -o gecko_sdk_4.4.0.zip -L https://github.com/SiliconLabs/gecko_sdk/releases/download/v4.4.0/gecko-sdk.zip \ - && unzip -q -d gecko_sdk_4.4.0 gecko_sdk_4.4.0.zip \ - && rm gecko_sdk_4.4.0.zip + 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 # Gecko SDK 4.3.1 RUN \ From 2d0b4b4c67cc77b3bcb7405b92b92852dd135c9e Mon Sep 17 00:00:00 2001 From: puddly <32534428+puddly@users.noreply.github.com> Date: Fri, 3 May 2024 13:11:46 -0400 Subject: [PATCH 9/9] Revert `SL_APPLICATION_PRODUCT_ID` change in firmware eraser --- misc/firmware-eraser/config/app_properties_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/firmware-eraser/config/app_properties_config.h b/misc/firmware-eraser/config/app_properties_config.h index 6951a569..792f1c8f 100644 --- a/misc/firmware-eraser/config/app_properties_config.h +++ b/misc/firmware-eraser/config/app_properties_config.h @@ -58,7 +58,7 @@ #define SL_APPLICATION_CAPABILITIES 0 //Product ID of the device for which the application is built -#define SL_APPLICATION_PRODUCT_ID { 0 } +#define SL_APPLICATION_PRODUCT_ID { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } //